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/parisc/harmony.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/parisc/harmony.c')
-rw-r--r-- | sound/parisc/harmony.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index ce73f3eae78c..cf603337b321 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
@@ -193,7 +193,7 @@ harmony_set_control(struct snd_harmony *h) | |||
193 | } | 193 | } |
194 | 194 | ||
195 | static irqreturn_t | 195 | static irqreturn_t |
196 | snd_harmony_interrupt(int irq, void *dev, struct pt_regs *regs) | 196 | snd_harmony_interrupt(int irq, void *dev) |
197 | { | 197 | { |
198 | u32 dstatus; | 198 | u32 dstatus; |
199 | struct snd_harmony *h = dev; | 199 | struct snd_harmony *h = dev; |