diff mbox

-tip: origin tree build failure (Was: [git pull] drm tree for merge window)

Message ID 4CC9981E.80202@turmel.org (mailing list archive)
State Accepted
Headers show

Commit Message

Phil Turmel Oct. 28, 2010, 3:34 p.m. UTC
None
diff mbox

Patch

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 72730e9..c33ecb6 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -11,6 +11,9 @@  config DRM_NOUVEAU
 	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
 	select ACPI_VIDEO if ACPI
+	select VIDEO_OUTPUT_CONTROL if ACPI
+	select BACKLIGHT_CLASS_DEVICE if ACPI
+	select INPUT if ACPI
 	help
 	  Choose this option for open-source nVidia support.