MTD: merge 3.18 development into -next development

[deliverable/linux.git] / sound / pcmcia / pdaudiocf / pdaudiocf.h

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h
index ea41e57d71794974559318d7aea7a8c46dfca5c9..e9a7d3a784f76963b8d4d591e8c5f6e0c32e445f 100644 (file)
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.h
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h
@@ -88,10 +88,9 @@ struct snd_pdacf {
        unsigned long port;
        int irq;
 
-       spinlock_t reg_lock;
+       struct mutex reg_lock;
        unsigned short regmap[8];
        unsigned short suspend_reg_scr;
-       struct tasklet_struct tq;
 
        spinlock_t ak4117_lock;
        struct ak4117 *ak4117;
@@ -136,7 +135,7 @@ int snd_pdacf_resume(struct snd_pdacf *chip);
 #endif
 int snd_pdacf_pcm_new(struct snd_pdacf *chip);
 irqreturn_t pdacf_interrupt(int irq, void *dev);
-void pdacf_tasklet(unsigned long private_data);
+irqreturn_t pdacf_threaded_irq(int irq, void *dev);
 void pdacf_reinit(struct snd_pdacf *chip, int resume);
 
 #endif /* __PDAUDIOCF_H */