diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /sound/isa/wavefront/wavefront.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
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/isa/wavefront/wavefront.c')
| -rw-r--r-- | sound/isa/wavefront/wavefront.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c index a8f8d2fa9d76..85db535aea9b 100644 --- a/sound/isa/wavefront/wavefront.c +++ b/sound/isa/wavefront/wavefront.c | |||
| @@ -263,9 +263,7 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c | |||
| 263 | 263 | ||
| 264 | #endif /* CONFIG_PNP */ | 264 | #endif /* CONFIG_PNP */ |
| 265 | 265 | ||
| 266 | static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, | 266 | static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, void *dev_id) |
| 267 | void *dev_id, | ||
| 268 | struct pt_regs *regs) | ||
| 269 | { | 267 | { |
| 270 | snd_wavefront_card_t *acard; | 268 | snd_wavefront_card_t *acard; |
| 271 | 269 | ||