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/pci/korg1212/korg1212.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/pci/korg1212/korg1212.c')
-rw-r--r-- | sound/pci/korg1212/korg1212.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index cfea51f44784..398aa10a06e8 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c | |||
@@ -1119,7 +1119,7 @@ static void snd_korg1212_OnDSPDownloadComplete(struct snd_korg1212 *korg1212) | |||
1119 | snd_korg1212_setCardState(korg1212, K1212_STATE_DSP_COMPLETE); | 1119 | snd_korg1212_setCardState(korg1212, K1212_STATE_DSP_COMPLETE); |
1120 | } | 1120 | } |
1121 | 1121 | ||
1122 | static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1122 | static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id) |
1123 | { | 1123 | { |
1124 | u32 doorbellValue; | 1124 | u32 doorbellValue; |
1125 | struct snd_korg1212 *korg1212 = dev_id; | 1125 | struct snd_korg1212 *korg1212 = dev_id; |