diff options
| author | Konstantin Khlebnikov <khlebnikov@openvz.org> | 2011-04-12 14:27:47 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-13 09:10:25 +1000 |
| commit | cbf15bdbbdaec3b2e3b4f476803a6149707d1a1f (patch) | |
| tree | c336db80a4b6cc32047b140f0a685b41809df6bd /drivers/gpu | |
| parent | 2feea49ae34a2fcea1035136b85f5eaca56f5cd0 (diff) | |
| download | linux-3.10-cbf15bdbbdaec3b2e3b4f476803a6149707d1a1f.tar.gz linux-3.10-cbf15bdbbdaec3b2e3b4f476803a6149707d1a1f.tar.bz2 linux-3.10-cbf15bdbbdaec3b2e3b4f476803a6149707d1a1f.zip | |
i915: select VIDEO_OUTPUT_CONTROL for ACPI_VIDEO
fix Kconfig warning:
(DRM_I915 && STUB_POULSBO) selects ACPI_VIDEO which has unmet direct dependencies
(ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT)
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/gpu/stub/Kconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index a6feb78c404..c58f691ec3c 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -96,6 +96,7 @@ config DRM_I915 # i915 depends on ACPI_VIDEO when ACPI is enabled # but for select to work, need to select ACPI_VIDEO's dependencies, ick select BACKLIGHT_CLASS_DEVICE if ACPI + select VIDEO_OUTPUT_CONTROL if ACPI select INPUT if ACPI select ACPI_VIDEO if ACPI select ACPI_BUTTON if ACPI diff --git a/drivers/gpu/stub/Kconfig b/drivers/gpu/stub/Kconfig index 70e60a4bb67..419917955bf 100644 --- a/drivers/gpu/stub/Kconfig +++ b/drivers/gpu/stub/Kconfig @@ -5,6 +5,7 @@ config STUB_POULSBO # Poulsbo stub depends on ACPI_VIDEO when ACPI is enabled # but for select to work, need to select ACPI_VIDEO's dependencies, ick select BACKLIGHT_CLASS_DEVICE if ACPI + select VIDEO_OUTPUT_CONTROL if ACPI select INPUT if ACPI select ACPI_VIDEO if ACPI select THERMAL if ACPI |