aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/emu10k1
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/emu10k1')
-rw-r--r--sound/oss/emu10k1/irqmgr.c2
-rw-r--r--sound/oss/emu10k1/main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/emu10k1/irqmgr.c b/sound/oss/emu10k1/irqmgr.c
index d19b464ba01b..fb2ce638f01c 100644
--- a/sound/oss/emu10k1/irqmgr.c
+++ b/sound/oss/emu10k1/irqmgr.c
@@ -37,7 +37,7 @@
37 37
38/* Interrupt handler */ 38/* Interrupt handler */
39 39
40irqreturn_t emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs) 40irqreturn_t emu10k1_interrupt(int irq, void *dev_id)
41{ 41{
42 struct emu10k1_card *card = (struct emu10k1_card *) dev_id; 42 struct emu10k1_card *card = (struct emu10k1_card *) dev_id;
43 u32 irqstatus, irqstatus_tmp; 43 u32 irqstatus, irqstatus_tmp;
diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c
index c4ce94d6e10c..6c59df7b0001 100644
--- a/sound/oss/emu10k1/main.c
+++ b/sound/oss/emu10k1/main.c
@@ -167,7 +167,7 @@ extern struct file_operations emu10k1_midi_fops;
167static struct midi_operations emu10k1_midi_operations; 167static struct midi_operations emu10k1_midi_operations;
168#endif 168#endif
169 169
170extern irqreturn_t emu10k1_interrupt(int, void *, struct pt_regs *s); 170extern irqreturn_t emu10k1_interrupt(int, void *);
171 171
172static int __devinit emu10k1_audio_init(struct emu10k1_card *card) 172static int __devinit emu10k1_audio_init(struct emu10k1_card *card)
173{ 173{