diff options
| author |   Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-11 15:04:34 -0700 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2011-05-16 11:57:20 +1000 |
| commit | fb0b760605d1f3bb7afc83ffd7a770f92bb62fca (patch) | |
| tree | 398aef95918f91c71e3f4dc87a1cf2207c90d634 /drivers/gpu/drm/nouveau | |
| parent | Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-core-next (diff) | |
| download | linux-dev-fb0b760605d1f3bb7afc83ffd7a770f92bb62fca.tar.xz linux-dev-fb0b760605d1f3bb7afc83ffd7a770f92bb62fca.zip | |
drm: fix nouveau_acpi build
Fix build errors when CONFIG_ACPI is enabled but MXM_WMI is not enabled
by selecting both MXM_WMI and ACPI_WMI (the latter just for kconfig
dependencies):
nouveau_acpi.c:(.text+0x2400c8): undefined reference to `mxm_wmi_call_mxmx'
nouveau_acpi.c:(.text+0x2400cf): undefined reference to `mxm_wmi_call_mxds'
nouveau_acpi.c:(.text+0x2400fe): undefined reference to `mxm_wmi_call_mxmx'
nouveau_acpi.c:(.text+0x2402ba): undefined reference to `mxm_wmi_supported
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index e83c5b1e1f0f..ca1639918f57 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -11,7 +11,8 @@ 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 && ACPI_WMI + select ACPI_WMI if ACPI + select MXM_WMI if ACPI help Choose this option for open-source nVidia support. |