diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-05-09 05:23:18 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-09 05:23:18 +0200 |
| commit | 269dc2d9194f74b920647e0f2ed0d822dc431770 (patch) | |
| tree | 6b6be1a7b9c152e27f12fba9d9d75cced9551b21 /drivers/platform/x86/Kconfig | |
| parent | drm/radeon/kms: fix some logic errors in combios i2c mapping (diff) | |
| parent | mxm/wmi: add MXMX interface entry point. (diff) | |
| download | linux-269dc2d9194f74b920647e0f2ed0d822dc431770.tar.xz linux-269dc2d9194f74b920647e0f2ed0d822dc431770.zip | |
Merge remote branch 'korg/drm-nvidia-switch-fixes' into drm-core-next
* korg/drm-nvidia-switch-fixes:
mxm/wmi: add MXMX interface entry point.
nouveau: add optimus detection to DSM code.
vgaarb: use bridges to control VGA routing where possible.
nouveau/acpi: hook up to the MXM method for mux switching.
platform/x86: add MXM WMI driver.
Diffstat (limited to 'drivers/platform/x86/Kconfig')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 0485e394712a..94914572dd7f 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -753,4 +753,11 @@ config SAMSUNG_LAPTOP To compile this driver as a module, choose M here: the module will be called samsung-laptop. +config MXM_WMI + tristate "WMI support for MXM Laptop Graphics" + depends on WMI + ---help--- + MXM is a standard for laptop graphics cards, the WMI interface + is required for switchable nvidia graphics machines + endif # X86_PLATFORM_DEVICES |