From: Dave Airlie Date: Mon, 9 May 2011 04:37:10 +0000 (+1000) Subject: drm/mxm: fix Kconfig options for when to build MXM WMI driver. X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0eacdba3a186e5d5b8a8bb421caacddc135e67e3;p=linux-beck.git drm/mxm: fix Kconfig options for when to build MXM WMI driver. Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index e2f8a38d5f24..e83c5b1e1f0f 100644 --- 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 94914572dd7f..006c6d5c7805 100644 --- 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