ACPI_VIDEO no longer depends on VIDEO_OUTPUT_CONTROL, so drivers which want to select ACPI_VIDEO no longer have to select VIDEO_OUTPUT_CONTROL.
Signed-off-by: Jean Delvare jdelvare@suse.de Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel.vetter@ffwll.ch Cc: Jani Nikula jani.nikula@linux.intel.com --- Changes since v1: * Chunk missing for the nouveau driver, sorry.
drivers/gpu/drm/gma500/Kconfig | 1 - drivers/gpu/drm/i915/Kconfig | 1 - drivers/gpu/drm/nouveau/Kconfig | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-)
--- linux-3.14-rc7.orig/drivers/gpu/drm/gma500/Kconfig 2014-03-17 15:47:47.522826767 +0100 +++ linux-3.14-rc7/drivers/gpu/drm/gma500/Kconfig 2014-03-17 16:04:15.310821089 +0100 @@ -10,7 +10,6 @@ config DRM_GMA500 # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915 select ACPI_VIDEO if ACPI select BACKLIGHT_CLASS_DEVICE if ACPI - select VIDEO_OUTPUT_CONTROL if ACPI select INPUT if ACPI help Say yes for an experimental 2D KMS framebuffer driver for the --- linux-3.14-rc7.orig/drivers/gpu/drm/i915/Kconfig 2014-03-17 15:47:47.522826767 +0100 +++ linux-3.14-rc7/drivers/gpu/drm/i915/Kconfig 2014-03-17 16:04:15.311821112 +0100 @@ -14,7 +14,6 @@ config DRM_I915 # but for select to work, need to select ACPI_VIDEO's dependencies, ick select BACKLIGHT_LCD_SUPPORT if ACPI 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 --- linux-3.14-rc7.orig/drivers/gpu/drm/nouveau/Kconfig 2014-03-17 15:47:47.522826767 +0100 +++ linux-3.14-rc7/drivers/gpu/drm/nouveau/Kconfig 2014-03-17 16:15:52.335899212 +0100 @@ -11,7 +11,7 @@ config DRM_NOUVEAU select FB select FRAMEBUFFER_CONSOLE if !EXPERT select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT - select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT + select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && INPUT select X86_PLATFORM_DEVICES if ACPI && X86 select ACPI_WMI if ACPI && X86 select MXM_WMI if ACPI && X86 @@ -19,7 +19,6 @@ config DRM_NOUVEAU # Similar to i915, we need to select ACPI_VIDEO and it's dependencies select BACKLIGHT_LCD_SUPPORT if ACPI && X86 select BACKLIGHT_CLASS_DEVICE if ACPI && X86 - select VIDEO_OUTPUT_CONTROL if ACPI && X86 select INPUT if ACPI && X86 select THERMAL if ACPI && X86 select ACPI_VIDEO if ACPI && X86