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/pcmcia/pdaudiocf/pdaudiocf.h | |
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/pcmcia/pdaudiocf/pdaudiocf.h')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h index 9a14a4f64bd3..206e2f5a113f 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.h +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h | |||
@@ -138,7 +138,7 @@ int snd_pdacf_suspend(struct snd_pdacf *chip, pm_message_t state); | |||
138 | int snd_pdacf_resume(struct snd_pdacf *chip); | 138 | int snd_pdacf_resume(struct snd_pdacf *chip); |
139 | #endif | 139 | #endif |
140 | int snd_pdacf_pcm_new(struct snd_pdacf *chip); | 140 | int snd_pdacf_pcm_new(struct snd_pdacf *chip); |
141 | irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs); | 141 | irqreturn_t pdacf_interrupt(int irq, void *dev); |
142 | void pdacf_tasklet(unsigned long private_data); | 142 | void pdacf_tasklet(unsigned long private_data); |
143 | void pdacf_reinit(struct snd_pdacf *chip, int resume); | 143 | void pdacf_reinit(struct snd_pdacf *chip, int resume); |
144 | 144 | ||