Merge branch 'master' into upstream-fixes

[sfrench/cifs-2.6.git] / sound / oss / mpu401.c

diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index 162d07cc489f6fba5411c8ccb8b884868d0ef11c..58d4a5d05a277f7651beac31686c8d5e09d05035 100644 (file)
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -432,7 +432,7 @@ static void mpu401_input_loop(struct mpu_config *devc)
        devc->m_busy = 0;
 }
 
-static irqreturn_t mpuintr(int irq, void *dev_id, struct pt_regs *dummy)
+static irqreturn_t mpuintr(int irq, void *dev_id)
 {
        struct mpu_config *devc;
        int dev = (int) dev_id;