Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[linux-2.6] / include / sound / initval.h

diff --git a/include/sound/initval.h b/include/sound/initval.h
index 2ae76efc696fef63fe3d8b51d8c30dd9b528b774..e85b90750a597514b0195c7efc781f3f0de8dc01 100644 (file)
--- a/include/sound/initval.h
+++ b/include/sound/initval.h
@@ -53,7 +53,7 @@
 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
 #include <linux/interrupt.h>
 
-static irqreturn_t snd_legacy_empty_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t snd_legacy_empty_irq_handler(int irq, void *dev_id)
 {
        return IRQ_HANDLED;
 }