Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / char / watchdog / wdt285.c

diff --git a/drivers/char/watchdog/wdt285.c b/drivers/char/watchdog/wdt285.c
index 89a249e23fdee2b0377d3e5a04ade645ee7979bf..e4cf661dc890b4d05050e83a6191e6364986571e 100644 (file)
--- a/drivers/char/watchdog/wdt285.c
+++ b/drivers/char/watchdog/wdt285.c
@@ -46,7 +46,7 @@ static unsigned long timer_alive;
 /*
  *     If the timer expires..
  */
-static void watchdog_fire(int irq, void *dev_id, struct pt_regs *regs)
+static void watchdog_fire(int irq, void *dev_id)
 {
        printk(KERN_CRIT "Watchdog: Would Reboot.\n");
        *CSR_TIMER4_CNTL = 0;