---

yaml --- r: 250578 b: refs/heads/master c: 0eacdba h: refs/heads/master v: v3
git-mirror · May 9, 2011 · 028034c · 028034c
1 parent 14863b2
commit 028034c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 269dc2d9194f74b920647e0f2ed0d822dc431770
+refs/heads/master: 0eacdba3a186e5d5b8a8bb421caacddc135e67e3
diff --git a/trunk/drivers/gpu/drm/nouveau/Kconfig b/trunk/drivers/gpu/drm/nouveau/Kconfig
@@ -11,7 +11,7 @@ config DRM_NOUVEAU
 	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 MXM_WMI if ACPI
+	select MXM_WMI if ACPI && ACPI_WMI
 	help
 	  Choose this option for open-source nVidia support.
 

diff --git a/trunk/drivers/platform/x86/Kconfig b/trunk/drivers/platform/x86/Kconfig
@@ -755,7 +755,7 @@ config SAMSUNG_LAPTOP
 
 config MXM_WMI
        tristate "WMI support for MXM Laptop Graphics"
-       depends on WMI
+       depends on ACPI_WMI
        ---help---
           MXM is a standard for laptop graphics cards, the WMI interface
 	  is required for switchable nvidia graphics machines