Skip to contentSkip to conversation

Fix use of acpi_register_irq

PATCH Andreas Schwab 1 participant 1 message Aug 5, 2004 Sound

lore
Share & tools
lore
#0 lore raw

2.6.8-rc3 does not define acpi_register_irq, but <asm-ia64/acpi.h> still declares it and sound/drivers/mpu401/mpu401.c uses it.

include/asm-ia64/acpi.h renamed from include/asm-ia64/acpi.h.~1~ +0 -1
@@ -95,7 +95,6 @@ static inline void disable_acpi(void) { 
 
 const char *acpi_get_sysname (void);
 int acpi_request_vector (u32 int_type);
-int acpi_register_irq (u32 gsi, u32 polarity, u32 trigger);
 int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
 
 #ifdef CONFIG_ACPI_NUMA
sound/drivers/mpu401/mpu401.c renamed from sound/drivers/mpu401/mpu401.c.~1~ +6 -3
@@ -30,6 +30,9 @@
 #ifdef CONFIG_ACPI_BUS
 #include <acpi/acpi_bus.h>
 #endif
+#ifdef CONFIG_IA64
+#include <linux/acpi.h>
+#endif
 #include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/mpu401.h>
@@ -99,9 +102,9 @@ static acpi_status __devinit snd_mpu401_
 	if (res->id = ACPI_RSTYPE_IRQ) {
 		if (res->data.irq.number_of_interrupts > 0) {
 #ifdef CONFIG_IA64
-			resources->irq = acpi_register_irq(res->data.irq.interrupts[0],
-							   res->data.irq.active_high_low,
-							   res->data.irq.edge_level);
+			resources->irq = acpi_register_gsi(res->data.irq.interrupts[0],
+							   res->data.irq.edge_level,
+							   res->data.irq.active_high_low);
 #else
 			resources->irq = res->data.irq.interrupts[0];
 #endif

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."