Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[karo-tx-linux.git] / include / sound / vx_core.h

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index 5fd6f3305e0d38de164bc9621a50d5c0c58a8ff1..4830651cc4cffd5dfafc1c29c5d5fd00c905ecac 100644 (file)
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -128,6 +128,7 @@ struct snd_vx_hardware {
        unsigned int num_ins;
        unsigned int num_outs;
        unsigned int output_level_max;
+       const unsigned int *output_level_db_scale;
 };
 
 /* hwdep id string */
@@ -206,7 +207,7 @@ struct vx_core {
        int audio_monitor[4];                   /* playback hw-monitor level */
        unsigned char audio_monitor_active[4];  /* playback hw-monitor mute/unmute */
 
-       struct semaphore mixer_mutex;
+       struct mutex mixer_mutex;
 
        const struct firmware *firmware[4]; /* loaded firmware data */
 };
@@ -227,7 +228,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, struct pt_regs *regs);
+irqreturn_t snd_vx_irq_handler(int irq, void *dev);
 
 /*
  * lowlevel functions