瀏覽代碼

drm/mxm: fix Kconfig options for when to build MXM WMI driver.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie 14 年之前
父節點
當前提交
0eacdba3a1
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/gpu/drm/nouveau/Kconfig
  2. 1 1
      drivers/platform/x86/Kconfig

+ 1 - 1
drivers/gpu/drm/nouveau/Kconfig

@@ -11,7 +11,7 @@ config DRM_NOUVEAU
 	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 && VIDEO_OUTPUT_CONTROL && INPUT
-	select MXM_WMI if ACPI
+	select MXM_WMI if ACPI && ACPI_WMI
 	help
 	help
 	  Choose this option for open-source nVidia support.
 	  Choose this option for open-source nVidia support.
 
 

+ 1 - 1
drivers/platform/x86/Kconfig

@@ -755,7 +755,7 @@ config SAMSUNG_LAPTOP
 
 
 config MXM_WMI
 config MXM_WMI
        tristate "WMI support for MXM Laptop Graphics"
        tristate "WMI support for MXM Laptop Graphics"
-       depends on WMI
+       depends on ACPI_WMI
        ---help---
        ---help---
           MXM is a standard for laptop graphics cards, the WMI interface
           MXM is a standard for laptop graphics cards, the WMI interface
 	  is required for switchable nvidia graphics machines
 	  is required for switchable nvidia graphics machines