Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'acpi-cppc'

[mirror_ubuntu-hirsute-kernel.git] / drivers / watchdog / sunxi_wdt.c

diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index e027deb5474037c869d09e716d92d35037df06e0..953bb7b7446f95367d39923a6c6a11a186a9052a 100644 (file)
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -83,7 +83,8 @@ static const int wdt_timeout_map[] = {
 };
 
 
-static int sunxi_wdt_restart(struct watchdog_device *wdt_dev)
+static int sunxi_wdt_restart(struct watchdog_device *wdt_dev,
+                            unsigned long action, void *data)
 {
        struct sunxi_wdt_dev *sunxi_wdt = watchdog_get_drvdata(wdt_dev);
        void __iomem *wdt_base = sunxi_wdt->wdt_base;