diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /sound/oss/emu10k1/irqmgr.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/oss/emu10k1/irqmgr.c')
| -rw-r--r-- | sound/oss/emu10k1/irqmgr.c | 2 |
1 files changed, 1 insertions, 1 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 | ||
| 40 | irqreturn_t emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 40 | irqreturn_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; |