diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /sound/pcmcia/pdaudiocf/pdaudiocf.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
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 | ||