ALSA CVS update

MPU401 UART
use acpi_register_gsi

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index b9e9dd4d3bce2755e403c93b047b4a156a06f49d..adc12bb9144214828418c54d11d5e4faa34cbbd4 100644 (file)
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -28,7 +28,7 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #ifdef CONFIG_ACPI_BUS
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
 #endif
 #include <linux/moduleparam.h>
 #include <sound/core.h>
@@ -91,13 +91,9 @@ static acpi_status __devinit snd_mpu401_acpi_resource(struct acpi_resource *res,
 
        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);
-#else
-                       resources->irq = res->data.irq.interrupts[0];
-#endif
+                       resources->irq = acpi_register_gsi(res->data.irq.interrupts[0],
+                                                          res->data.irq.edge_level,
+                                                          res->data.irq.active_high_low);
                }
        } else if (res->id == ACPI_RSTYPE_IO) {
                if (res->data.io.range_length >= 2) {
@@ -168,7 +164,7 @@ static int __devinit snd_card_mpu401_probe(int dev, struct acpi_device *device)
        }
 #ifdef USE_ACPI_PNP
        if (device) {
-               strcat(card->longname, ", bus id ");
+               strcat(card->longname, ", ACPI id ");
                strlcat(card->longname, acpi_device_bid(device), sizeof(card->longname));
        }
 #endif