Merge ../linux-2.6-watchdog-mm

[linux-2.6-omap-h63xx.git] / sound / oss / emu10k1 / main.c

diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c
index c4ce94d6e10cb6415e3aa29457842da519ab5998..6c59df7b00011965f04cad5f5f3a3bd17319ae5d 100644 (file)
--- a/sound/oss/emu10k1/main.c
+++ b/sound/oss/emu10k1/main.c
@@ -167,7 +167,7 @@ extern struct file_operations emu10k1_midi_fops;
 static struct midi_operations emu10k1_midi_operations;
 #endif
 
-extern irqreturn_t emu10k1_interrupt(int, void *, struct pt_regs *s);
+extern irqreturn_t emu10k1_interrupt(int, void *);
 
 static int __devinit emu10k1_audio_init(struct emu10k1_card *card)
 {