vserver 1.9.3

[linux-2.6.git] / sound / drivers / mpu401 / mpu401.c

diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 4b00250..adc12bb 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>
@@ -42,7 +42,6 @@
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("MPU-401 UART");
 MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;     /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;      /* ID for this card */
@@ -56,24 +55,18 @@ static int boot_devs;
 
 module_param_array(index, int, boot_devs, 0444);
 MODULE_PARM_DESC(index, "Index value for MPU-401 device.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
 module_param_array(id, charp, boot_devs, 0444);
 MODULE_PARM_DESC(id, "ID string for MPU-401 device.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
 module_param_array(enable, bool, boot_devs, 0444);
 MODULE_PARM_DESC(enable, "Enable MPU-401 device.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
 #ifdef USE_ACPI_PNP
 module_param_array(acpipnp, bool, boot_devs, 0444);
 MODULE_PARM_DESC(acpipnp, "ACPI PnP detection for MPU-401 device.");
-MODULE_PARM_SYNTAX(acpipnp, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
 #endif
 module_param_array(port, long, boot_devs, 0444);
 MODULE_PARM_DESC(port, "Port # for MPU-401 device.");
-MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
 module_param_array(irq, int, boot_devs, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device.");
-MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
 
 #ifndef CONFIG_ACPI_BUS
 struct acpi_device;
@@ -98,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) {
@@ -175,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