[PATCH] nouveau: fix build error on IA64

[PATCH] nouveau: fix build error on IA64

[Fengguang Wu]

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!

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---
 drivers/gpu/drm/nouveau/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 97a8126..046bb56 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -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
-- 
1.7.10

Re: [PATCH] nouveau: fix build error on IA64

[Fengguang Wu]

> -	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 <fengguang.wu@intel.com>
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!

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---
 drivers/gpu/drm/nouveau/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux.orig/drivers/gpu/drm/nouveau/Kconfig	2012-07-25 19:09:37.715358715 +0800
+++ linux/drivers/gpu/drm/nouveau/Kconfig	2012-07-25 22:34:43.775298923 +0800
@@ -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.