diff options
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf.h')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h index ea41e57d7179..e9a7d3a784f7 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.h +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h | |||
@@ -88,10 +88,9 @@ struct snd_pdacf { | |||
88 | unsigned long port; | 88 | unsigned long port; |
89 | int irq; | 89 | int irq; |
90 | 90 | ||
91 | spinlock_t reg_lock; | 91 | struct mutex reg_lock; |
92 | unsigned short regmap[8]; | 92 | unsigned short regmap[8]; |
93 | unsigned short suspend_reg_scr; | 93 | unsigned short suspend_reg_scr; |
94 | struct tasklet_struct tq; | ||
95 | 94 | ||
96 | spinlock_t ak4117_lock; | 95 | spinlock_t ak4117_lock; |
97 | struct ak4117 *ak4117; | 96 | struct ak4117 *ak4117; |
@@ -136,7 +135,7 @@ int snd_pdacf_resume(struct snd_pdacf *chip); | |||
136 | #endif | 135 | #endif |
137 | int snd_pdacf_pcm_new(struct snd_pdacf *chip); | 136 | int snd_pdacf_pcm_new(struct snd_pdacf *chip); |
138 | irqreturn_t pdacf_interrupt(int irq, void *dev); | 137 | irqreturn_t pdacf_interrupt(int irq, void *dev); |
139 | void pdacf_tasklet(unsigned long private_data); | 138 | irqreturn_t pdacf_threaded_irq(int irq, void *dev); |
140 | void pdacf_reinit(struct snd_pdacf *chip, int resume); | 139 | void pdacf_reinit(struct snd_pdacf *chip, int resume); |
141 | 140 | ||
142 | #endif /* __PDAUDIOCF_H */ | 141 | #endif /* __PDAUDIOCF_H */ |