Merge branch 'pm-cpufreq-fixes'

[cascardo/linux.git] / drivers / watchdog / bcm47xx_wdt.c

diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index df1c2a4..a1900b9 100644 (file)
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -87,7 +87,8 @@ static int bcm47xx_wdt_hard_set_timeout(struct watchdog_device *wdd,
        return 0;
 }
 
-static int bcm47xx_wdt_restart(struct watchdog_device *wdd)
+static int bcm47xx_wdt_restart(struct watchdog_device *wdd,
+                              unsigned long action, void *data)
 {
        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);