Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[mv-sheeva.git] / sound / oss / i810_audio.c

diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index ddcddc2347f7ec3450624b296f6e385b0013575a..240cc7939b69e6137ca8adfd33f4d6c44b8d172f 100644 (file)
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -1523,9 +1523,9 @@ static void i810_channel_interrupt(struct i810_card *card)
 #endif
 }
 
-static irqreturn_t i810_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t i810_interrupt(int irq, void *dev_id)
 {
-       struct i810_card *card = (struct i810_card *)dev_id;
+       struct i810_card *card = dev_id;
        u32 status;
 
        spin_lock(&card->lock);