diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 01:32:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 01:32:01 +0200 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /sound/oss/cs46xx.c | |
parent | [PATCH] UDF: Fix mounting read-write (diff) | |
parent | IRQ: Maintain regs pointer globally rather than passing to IRQ handlers (diff) | |
download | linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.tar.xz linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.zip |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'sound/oss/cs46xx.c')
-rw-r--r-- | sound/oss/cs46xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c index 43193581f836..6e3c41f530e6 100644 --- a/sound/oss/cs46xx.c +++ b/sound/oss/cs46xx.c @@ -1613,7 +1613,7 @@ static void cs_handle_midi(struct cs_card *card) wake_up(&card->midi.owait); } -static irqreturn_t cs_interrupt(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t cs_interrupt(int irq, void *dev_id) { struct cs_card *card = (struct cs_card *)dev_id; /* Single channel card */ |