From 8afbc2ba5f5fa33cf81cc6fc8818139427f274f7 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Thu, 22 Mar 2012 09:37:10 +0100 Subject: [PATCH] --- yaml --- r: 296796 b: refs/heads/master c: 2ca1606359695cc7ce371c7829c4082d9095fc06 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/ep93xx_wdt.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e4068c825178..c33275ba56fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3 +refs/heads/master: 2ca1606359695cc7ce371c7829c4082d9095fc06 diff --git a/trunk/drivers/watchdog/ep93xx_wdt.c b/trunk/drivers/watchdog/ep93xx_wdt.c index 29575f8228bd..77050037597a 100644 --- a/trunk/drivers/watchdog/ep93xx_wdt.c +++ b/trunk/drivers/watchdog/ep93xx_wdt.c @@ -42,8 +42,8 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); -static int timeout = WDT_TIMEOUT; -module_param(timeout, int, 0); +static unsigned int timeout = WDT_TIMEOUT; +module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WDT_TIMEOUT) ")"); @@ -55,7 +55,7 @@ static unsigned long next_heartbeat; #define EP93XX_WATCHDOG 0x00 #define EP93XX_WDSTATUS 0x04 -/* reset the wdt every ~200ms */ +/* reset the wdt every ~200ms - the heartbeat of the device is 0.250 seconds*/ #define WDT_INTERVAL (HZ/5) static void ep93xx_wdt_timer_ping(unsigned long data)