Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / sound / pci / riptide / riptide.c

diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index f435fcd6dca99b7922a4c44a139b6551b4965bb6..ec4899147e1dcd0d221bdf1a5e7c28c2cedb36a0 100644 (file)
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -673,9 +673,13 @@ static struct lbuspath lbus_rec_path = {
 #define FIRMWARE_VERSIONS 1
 static union firmware_version firmware_versions[] = {
        {
-        .firmware.ASIC = 3,.firmware.CODEC = 2,
-        .firmware.AUXDSP = 3,.firmware.PROG = 773,
-        },
+               .firmware = {
+                       .ASIC = 3,
+                       .CODEC = 2,
+                       .AUXDSP = 3,
+                       .PROG = 773,
+               },
+       },
 };
 
 static u32 atoh(unsigned char *in, unsigned int len)
@@ -1732,7 +1736,7 @@ snd_riptide_pcm(struct snd_riptide *chip, int device, struct snd_pcm **rpcm)
 }
 
 static irqreturn_t
-snd_riptide_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+snd_riptide_interrupt(int irq, void *dev_id)
 {
        struct snd_riptide *chip = dev_id;
        struct cmdif *cif = chip->cif;
@@ -1747,8 +1751,7 @@ snd_riptide_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                if (chip->rmidi && IS_MPUIRQ(cif->hwport)) {
                        chip->handled_irqs++;
                        snd_mpu401_uart_interrupt(irq,
-                                                 chip->rmidi->private_data,
-                                                 regs);
+                                                 chip->rmidi->private_data);
                }
                SET_AIACK(cif->hwport);
        }