From d1ced2fcaf08bbf1679098c3db74b839cb542010 Mon Sep 17 00:00:00 2001
From: Phil Turmel <philip@turmel.org>
Date: Tue, 14 Sep 2010 20:14:11 -0400
Subject: [PATCH] --- yaml --- r: 218206 b: refs/heads/master c:
 e022878571690e09e965e8c6bfc837b3dc5b6b74 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/nouveau/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4b2c9f00524f..7dd2d427308a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64f1c11a477cb76e1572ee0793234739e045b3d5
+refs/heads/master: e022878571690e09e965e8c6bfc837b3dc5b6b74
diff --git a/trunk/drivers/gpu/drm/nouveau/Kconfig b/trunk/drivers/gpu/drm/nouveau/Kconfig
index d2d28048efb2..72730e9ca06c 100644
--- a/trunk/drivers/gpu/drm/nouveau/Kconfig
+++ b/trunk/drivers/gpu/drm/nouveau/Kconfig
@@ -10,6 +10,7 @@ config DRM_NOUVEAU
 	select FB
 	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
+	select ACPI_VIDEO if ACPI
 	help
 	  Choose this option for open-source nVidia support.