diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-09 10:33:26 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-19 09:16:19 +0100 |
| commit | 939fe4d7d6e2c92370ca5d1fb70e81043f5ff8d9 (patch) | |
| tree | cffcf208f082ebb9cd5a93781c057393230647a3 | |
| parent | 83e41eb9cc3de6c08d63bbcf2c953bfbf65c025c (diff) | |
| download | kernel_samsung_espresso10-939fe4d7d6e2c92370ca5d1fb70e81043f5ff8d9.zip kernel_samsung_espresso10-939fe4d7d6e2c92370ca5d1fb70e81043f5ff8d9.tar.gz kernel_samsung_espresso10-939fe4d7d6e2c92370ca5d1fb70e81043f5ff8d9.tar.bz2 | |
drm/i915: Remove duplicate set of ADPA definitions
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 4703218..557f271 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -661,13 +661,6 @@ #define LVDS 0x61180 #define LVDS_ON (1<<31) -#define ADPA 0x61100 -#define ADPA_DPMS_MASK (~(3<<10)) -#define ADPA_DPMS_ON (0<<10) -#define ADPA_DPMS_SUSPEND (1<<10) -#define ADPA_DPMS_STANDBY (2<<10) -#define ADPA_DPMS_OFF (3<<10) - /* Scratch pad debug 0 reg: */ #define DPLL_FPA01_P1_POST_DIV_MASK_I830 0x001f0000 @@ -1200,6 +1193,7 @@ #define ADPA_DPMS_STANDBY (2<<10) #define ADPA_DPMS_OFF (3<<10) + /* Hotplug control (945+ only) */ #define PORT_HOTPLUG_EN 0x61110 #define HDMIB_HOTPLUG_INT_EN (1 << 29) |