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/sb/es968.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/sb/es968.c')
| -rw-r--r-- | sound/isa/sb/es968.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c index d4d65b84265a..d4b218726ce7 100644 --- a/sound/isa/sb/es968.c +++ b/sound/isa/sb/es968.c | |||
| @@ -70,8 +70,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids); | |||
| 70 | 70 | ||
| 71 | #define DRIVER_NAME "snd-card-es968" | 71 | #define DRIVER_NAME "snd-card-es968" |
| 72 | 72 | ||
| 73 | static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id, | 73 | static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id) |
| 74 | struct pt_regs *regs) | ||
| 75 | { | 74 | { |
| 76 | struct snd_sb *chip = dev_id; | 75 | struct snd_sb *chip = dev_id; |
| 77 | 76 | ||