nouveau: ACPI support is dependent on X86

PATCH New Ben Hutchings 1 participant 1 message Jun 6, 2011

Subsystems (3)

DRM drivers DRM misc nouveau

lore

Share & tools

lore

Ben Hutchings

author

2011-06-06 00:45 UTC #0 lore raw

PATCH 1/1 nouveau: ACPI support is dependent on X86

The ACPI support code probably wasn't very useful on ia64, and now depends on mxm-wmi which is definitely x86-only.

Compile-tested on ia64 and i386.

Signed-off-by Ben Hutchings <[email protected]>

---
 drivers/gpu/drm/nouveau/Kconfig       |    4 ++--
 drivers/gpu/drm/nouveau/Makefile      |    2 ++
 drivers/gpu/drm/nouveau/nouveau_drv.h |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

drivers/gpu/drm/nouveau/Kconfig +2 -2

index ca16399..5a85697 100644
@@ -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 && X86
+	select MXM_WMI if ACPI && X86
 	help
 	  Choose this option for open-source nVidia support.

drivers/gpu/drm/nouveau/Makefile +2 -0

index 0583677..797b808 100644
@@ -37,6 +37,8 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
 nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
 nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
+ifdef CONFIG_X86
 nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
+endif
 
 obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o

drivers/gpu/drm/nouveau/nouveau_drv.h +1 -1

index 9c56331..9ea5a17 100644
@@ -968,7 +968,7 @@ extern int  nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
 
 /* nouveau_acpi.c */
 #define ROM_BIOS_PAGE 4096
-#if defined(CONFIG_ACPI)
+#if defined(CONFIG_ACPI) && defined(CONFIG_X86)
 void nouveau_register_dsm_handler(void);
 void nouveau_unregister_dsm_handler(void);
 int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);

Signature · 1 line

1.7.5.3