Merge git://git.infradead.org/~dwmw2/cafe-2.6

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

diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c
index 406ac3a9d42ade4329ed16c6ef49f5e61f6a46d6..d54457317b148302f8831395768b2cf82c4d4234 100644 (file)
--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -408,7 +408,7 @@ void snd_mixart_msg_tasklet(unsigned long arg)
 }
 
 
-irqreturn_t snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t snd_mixart_interrupt(int irq, void *dev_id)
 {
        struct mixart_mgr *mgr = dev_id;
        int err;