Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/net-2.6

[sfrench/cifs-2.6.git] / sound / drivers / mts64.c

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 911c159bb3d3208f6b42fdc45950c9d245bd75a2..dcc90f995294dc6c960b7a5dfd5a2f64fd329fa1 100644 (file)
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -830,7 +830,7 @@ static int __devinit snd_mts64_rawmidi_create(struct snd_card *card)
 /*********************************************************************
  * parport stuff
  *********************************************************************/
-static void snd_mts64_interrupt(int irq, void *private)
+static void snd_mts64_interrupt(void *private)
 {
        struct mts64 *mts = ((struct snd_card*)private)->private_data;
        u16 ret;