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

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index e2f8a38d5f243a399086c364880c4a886cb6eb7d..e83c5b1e1f0f82c7e5129c46a49601ec1f854938 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/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/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 94914572dd7fa694f1c4b8578c6fc86b4fc3bda8..006c6d5c78052a3a6866e3f7e872a0c21cb1b16e 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/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