Skip to contentSkip to conversation

nouveau: fix build error on IA64

PATCH In review Fengguang Wu 1 participant 2 messages Jul 25, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nouveau: fix build error on IA64

I'm not sure if this is the best way, however it does fix the last 2 allmodconfig errors on IA64:

ERROR: "wmi_has_guid" [drivers/gpu/drm/nouveau/nouveau.ko] undefined!
ERROR: "wmi_evaluate_method" [drivers/gpu/drm/nouveau/nouveau.ko] undefined!

---
 drivers/gpu/drm/nouveau/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/Kconfig +1 -1
index 97a8126..046bb56 100644
@@ -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 ACPI_WMI if ACPI
+	select ACPI_WMI if ACPI && !IA64
 	select MXM_WMI if ACPI
 	select POWER_SUPPLY
 	help
Signature · 1 line
1.7.10
#1 lore raw

Review

Quoted 3 lines
(quoted diff) +1 -1
-	select ACPI_WMI if ACPI
+	select ACPI_WMI if ACPI && !IA64
 	select MXM_WMI if ACPI

Sorry, the MXM_WMI line should also be changed. Although MXM_WMI depends on ACPI_WMI, "select" is dumb and will ignore that dependency..

Thanks,
Fengguang
---
From: Fengguang Wu <[email protected]>
Date: Wed, 25 Jul 2012 15:56:35 +0800
Subject: [PATCH] nouveau: fix build error on IA64

I'm not sure if this is the best way, however it does fix these link errors on IA64:

ERROR: "wmi_has_guid" [drivers/gpu/drm/nouveau/nouveau.ko] undefined!
ERROR: "wmi_evaluate_method" [drivers/gpu/drm/nouveau/nouveau.ko] undefined!

---
 drivers/gpu/drm/nouveau/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/Kconfig +2 -2
@@ -11,8 +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 ACPI_WMI if ACPI
-	select MXM_WMI if ACPI
+	select ACPI_WMI if ACPI && !IA64
+	select MXM_WMI if ACPI && !IA64
 	select POWER_SUPPLY
 	help
 	  Choose this option for open-source nVidia support.