Merge branch 'master' into upstream-fixes

[pandora-kernel.git] / sound / oss / vwsnd.c

diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index 5f140c7..0cd4d6e 100644 (file)
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -2233,12 +2233,12 @@ static void vwsnd_audio_write_intr(vwsnd_dev_t *devc, unsigned int status)
                pcm_output(devc, underflown, 0);
 }
 
-static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id)
 {
        vwsnd_dev_t *devc = (vwsnd_dev_t *) dev_id;
        unsigned int status;
 
-       DBGEV("(irq=%d, dev_id=0x%p, regs=0x%p)\n", irq, dev_id, regs);
+       DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id);
 
        status = li_get_clear_intr_status(&devc->lith);
        vwsnd_audio_read_intr(devc, status);