OSDN Git Service

drm/mxm: fix Kconfig options for when to build MXM WMI driver.
authorDave Airlie <airlied@redhat.com>
Mon, 9 May 2011 04:37:10 +0000 (14:37 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 9 May 2011 04:37:10 +0000 (14:37 +1000)
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/nouveau/Kconfig
drivers/platform/x86/Kconfig

index e2f8a38..e83c5b1 100644 (file)
@@ -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.
 
index 9491457..006c6d5 100644 (file)
@@ -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