aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-05-09 00:37:10 -0400
committerDave Airlie <airlied@redhat.com>2011-05-09 00:37:10 -0400
commit0eacdba3a186e5d5b8a8bb421caacddc135e67e3 (patch)
tree8b3bced1b4b92cb66ec85dd38fad95e4312f78cf /drivers
parent269dc2d9194f74b920647e0f2ed0d822dc431770 (diff)
drm/mxm: fix Kconfig options for when to build MXM WMI driver.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/Kconfig2
-rw-r--r--drivers/platform/x86/Kconfig2
2 files changed, 2 insertions, 2 deletions
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
11 select FRAMEBUFFER_CONSOLE if !EXPERT 11 select FRAMEBUFFER_CONSOLE if !EXPERT
12 select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT 12 select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
13 select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT 13 select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT
14 select MXM_WMI if ACPI 14 select MXM_WMI if ACPI && ACPI_WMI
15 help 15 help
16 Choose this option for open-source nVidia support. 16 Choose this option for open-source nVidia support.
17 17
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
755 755
756config MXM_WMI 756config MXM_WMI
757 tristate "WMI support for MXM Laptop Graphics" 757 tristate "WMI support for MXM Laptop Graphics"
758 depends on WMI 758 depends on ACPI_WMI
759 ---help--- 759 ---help---
760 MXM is a standard for laptop graphics cards, the WMI interface 760 MXM is a standard for laptop graphics cards, the WMI interface
761 is required for switchable nvidia graphics machines 761 is required for switchable nvidia graphics machines