diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-05-09 13:23:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-09 13:23:18 +1000 |
| commit | 269dc2d9194f74b920647e0f2ed0d822dc431770 (patch) | |
| tree | 6b6be1a7b9c152e27f12fba9d9d75cced9551b21 /drivers/gpu/drm/nouveau/Kconfig | |
| parent | 776f2b7cb473baa52cdeee9804073342dee7d7cb (diff) | |
| parent | 000703f44c77b152cd966eaf06f4ab043274ff46 (diff) | |
| download | talos-obmc-linux-269dc2d9194f74b920647e0f2ed0d822dc431770.tar.gz talos-obmc-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/gpu/drm/nouveau/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/nouveau/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index de70959b9ed5..e2f8a38d5f24 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -11,6 +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 help Choose this option for open-source nVidia support. |
