Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ACPI / gpu / drm: Stop selecting VIDEO_OUTPUT_CONTROL

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>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Jean Delvare 11 years ago
parent
9f380fc56a
commit
a386c006a7
3 changed files with 1 additions and 4 deletions
Unified View Show Diff Stats
  1. 0 1
      drivers/gpu/drm/gma500/Kconfig
  2. 0 1
      drivers/gpu/drm/i915/Kconfig
  3. 1 2
      drivers/gpu/drm/nouveau/Kconfig

+ 0 - 1
drivers/gpu/drm/gma500/Kconfig
View File 

@@ -10,7 +10,6 @@ config DRM_GMA500
 
 	# GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915
 
 	# GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915
 
 	select ACPI_VIDEO if ACPI
 
 	select ACPI_VIDEO if ACPI
 
 	select BACKLIGHT_CLASS_DEVICE if ACPI
 
 	select BACKLIGHT_CLASS_DEVICE if ACPI
 
-	select VIDEO_OUTPUT_CONTROL if ACPI
 
 	select INPUT if ACPI
 
 	select INPUT if ACPI
 
 	help
 
 	help
 
 	  Say yes for an experimental 2D KMS framebuffer driver for the
 
 	  Say yes for an experimental 2D KMS framebuffer driver for the

+ 0 - 1
drivers/gpu/drm/i915/Kconfig
View File 

@@ -14,7 +14,6 @@ config DRM_I915
 
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 
 	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
 
 	select BACKLIGHT_LCD_SUPPORT if ACPI
 
 	select BACKLIGHT_LCD_SUPPORT if ACPI
 
 	select BACKLIGHT_CLASS_DEVICE if ACPI
 
 	select BACKLIGHT_CLASS_DEVICE if ACPI
 
-	select VIDEO_OUTPUT_CONTROL if ACPI
 
 	select INPUT if ACPI
 
 	select INPUT if ACPI
 
 	select ACPI_VIDEO if ACPI
 
 	select ACPI_VIDEO if ACPI
 
 	select ACPI_BUTTON if ACPI
 
 	select ACPI_BUTTON if ACPI

+ 1 - 2
drivers/gpu/drm/nouveau/Kconfig
View File 

@@ -11,7 +11,7 @@ config DRM_NOUVEAU
 
 	select FB
 
 	select FB
 
 	select FRAMEBUFFER_CONSOLE if !EXPERT
 
 	select FRAMEBUFFER_CONSOLE if !EXPERT
 
 	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
 
 	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 X86_PLATFORM_DEVICES if ACPI && X86
 
 	select ACPI_WMI if ACPI && X86
 
 	select ACPI_WMI if ACPI && X86
 
 	select MXM_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
 
 	# Similar to i915, we need to select ACPI_VIDEO and it's dependencies
 
 	select BACKLIGHT_LCD_SUPPORT if ACPI && X86
 
 	select BACKLIGHT_LCD_SUPPORT if ACPI && X86
 
 	select BACKLIGHT_CLASS_DEVICE if ACPI && X86
 
 	select BACKLIGHT_CLASS_DEVICE if ACPI && X86
 
-	select VIDEO_OUTPUT_CONTROL if ACPI && X86
 
 	select INPUT if ACPI && X86
 
 	select INPUT if ACPI && X86
 
 	select THERMAL if ACPI && X86
 
 	select THERMAL if ACPI && X86
 
 	select ACPI_VIDEO if ACPI && X86
 
 	select ACPI_VIDEO if ACPI && X86