Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / fc4 / soc.c

diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index 3b07e0ca81cdf9b60ac26214d60c0a7169b33bfc..b09dfc78e5a2b10d34965ede7329ed7a8a311652 100644 (file)
--- a/drivers/fc4/soc.c
+++ b/drivers/fc4/soc.c
@@ -334,7 +334,7 @@ update_out:
        }
 }
 
-static irqreturn_t soc_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t soc_intr(int irq, void *dev_id)
 {
        u32 cmd;
        unsigned long flags;