X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fsound%2Fvx_core.h;h=4830651cc4cffd5dfafc1c29c5d5fd00c905ecac;hb=6a3d586d8e8a50e4cfd7f8c36d82a53c5614e05b;hp=5fd6f3305e0d38de164bc9621a50d5c0c58a8ff1;hpb=b8c475be7bf9b79e6417c08d7a921b2e8cb04258;p=powerpc.git

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index 5fd6f3305e..4830651cc4 100644
--- 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