Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of...

[cascardo/linux.git] / include / sound / vx_core.h

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index f634f8f..cae9c9d 100644 (file)
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -80,8 +80,6 @@ struct vx_pipe {
 
        unsigned int references;     /* an output pipe may be used for monitoring and/or playback */
        struct vx_pipe *monitoring_pipe;  /* pointer to the monitoring pipe (capture pipe only)*/
-
-       struct tasklet_struct start_tq;
 };
 
 struct vx_core;
@@ -165,9 +163,7 @@ struct vx_core {
        struct snd_vx_hardware *hw;
        struct snd_vx_ops *ops;
 
-       spinlock_t lock;
-       spinlock_t irq_lock;
-       struct tasklet_struct tq;
+       struct mutex lock;
 
        unsigned int chip_status;
        unsigned int pcm_running;
@@ -223,6 +219,7 @@ void snd_vx_free_firmware(struct vx_core *chip);
  * interrupt handler; exported for pcmcia
  */
 irqreturn_t snd_vx_irq_handler(int irq, void *dev);
+irqreturn_t snd_vx_threaded_irq_handler(int irq, void *dev);
 
 /*
  * lowlevel functions