From 7615217e8abf22474da46322d5143e46891d1e45 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Sun, 11 Sep 2005 23:58:22 +0200 Subject: [PATCH] --- yaml --- r: 8813 b: refs/heads/master c: 3908bb1867e7455c4ea132b758970c312513c37d h: refs/heads/master i: 8811: 2edc93ba5301aafc1ca0e2a46d4fc9ae116fb497 v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/sbc8360.c | 7 +------ trunk/drivers/char/watchdog/w83977f_wdt.c | 7 +------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 4e01bf58c6d8..8684f8f8e15f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4cc4aa24ca47b6a2bdb9029020502cff7c6e774 +refs/heads/master: 3908bb1867e7455c4ea132b758970c312513c37d diff --git a/trunk/drivers/char/watchdog/sbc8360.c b/trunk/drivers/char/watchdog/sbc8360.c index 06daf426d5b6..c6cbf808d8c2 100644 --- a/trunk/drivers/char/watchdog/sbc8360.c +++ b/trunk/drivers/char/watchdog/sbc8360.c @@ -199,12 +199,7 @@ static int wd_times[64][2] = { static int timeout = 27; static int wd_margin = 0xB; static int wd_multiplier = 2; - -#ifdef CONFIG_WATCHDOG_NOWAYOUT -static int nowayout = 1; -#else -static int nowayout = 0; -#endif +static int nowayout = WATCHDOG_NOWAYOUT; module_param(timeout, int, 27); MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); diff --git a/trunk/drivers/char/watchdog/w83977f_wdt.c b/trunk/drivers/char/watchdog/w83977f_wdt.c index 366d47bca16e..a7ff64c8921f 100644 --- a/trunk/drivers/char/watchdog/w83977f_wdt.c +++ b/trunk/drivers/char/watchdog/w83977f_wdt.c @@ -58,12 +58,7 @@ MODULE_PARM_DESC(timeout,"Watchdog timeout in seconds (15..7635), default=" __MO module_param(testmode, int, 0); MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0"); -#ifdef CONFIG_WATCHDOG_NOWAYOUT -static int nowayout = 1; -#else -static int nowayout = 0; -#endif - +static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");