diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 05:02:10 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 05:02:10 -0500 |
| commit | 9e0c20bceb611917a7546172ac617d07e5af0cfa (patch) | |
| tree | 961e9397fd1d913d2f0d5cd88fb05a70b68d955d /drivers/gpu | |
| parent | fe3ded5078e957d80c43837e1966429cf0029c10 (diff) | |
| parent | 82069552555cf951d9ade5c1aec61dd40b0765b5 (diff) | |
Merge branch 'acpi-video' into release
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/gpu/stub/Kconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 7af443672626..64828a7db77b 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
| @@ -107,7 +107,6 @@ config DRM_I915 | |||
| 107 | select FB_CFB_IMAGEBLIT | 107 | select FB_CFB_IMAGEBLIT |
| 108 | # i915 depends on ACPI_VIDEO when ACPI is enabled | 108 | # i915 depends on ACPI_VIDEO when ACPI is enabled |
| 109 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick | 109 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick |
| 110 | select VIDEO_OUTPUT_CONTROL if ACPI | ||
| 111 | select BACKLIGHT_CLASS_DEVICE if ACPI | 110 | select BACKLIGHT_CLASS_DEVICE if ACPI |
| 112 | select INPUT if ACPI | 111 | select INPUT if ACPI |
| 113 | select ACPI_VIDEO if ACPI | 112 | select ACPI_VIDEO if ACPI |
diff --git a/drivers/gpu/stub/Kconfig b/drivers/gpu/stub/Kconfig index 0e1edd7311ff..09aea5f1556d 100644 --- a/drivers/gpu/stub/Kconfig +++ b/drivers/gpu/stub/Kconfig | |||
| @@ -3,7 +3,6 @@ config STUB_POULSBO | |||
| 3 | depends on PCI | 3 | depends on PCI |
| 4 | # Poulsbo stub depends on ACPI_VIDEO when ACPI is enabled | 4 | # Poulsbo stub depends on ACPI_VIDEO when ACPI is enabled |
| 5 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick | 5 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick |
| 6 | select VIDEO_OUTPUT_CONTROL if ACPI | ||
| 7 | select BACKLIGHT_CLASS_DEVICE if ACPI | 6 | select BACKLIGHT_CLASS_DEVICE if ACPI |
| 8 | select INPUT if ACPI | 7 | select INPUT if ACPI |
| 9 | select ACPI_VIDEO if ACPI | 8 | select ACPI_VIDEO if ACPI |