Pull bugzilla-7349 into test branch

[powerpc.git] / sound / drivers / mts64.c

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 1699873..5327c6f 100644 (file)
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -677,7 +677,7 @@ static int __devinit snd_mts64_ctl_create(struct snd_card *card,
                &mts64_ctl_smpte_time_seconds,
                &mts64_ctl_smpte_time_frames,
                &mts64_ctl_smpte_fps,
-               0  };
+               NULL  };
 
        for (i = 0; control[i]; ++i) {
                err = snd_ctl_add(card, snd_ctl_new1(control[i], mts));
@@ -838,7 +838,7 @@ static int __devinit snd_mts64_rawmidi_create(struct snd_card *card)
 /*********************************************************************
  * parport stuff
  *********************************************************************/
-static void snd_mts64_interrupt(int irq, void *private, struct pt_regs *r)
+static void snd_mts64_interrupt(int irq, void *private)
 {
        struct mts64 *mts = ((struct snd_card*)private)->private_data;
        u16 ret;