diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2005-09-11 23:58:22 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2005-09-12 09:37:41 +0200 |
| commit | 3908bb1867e7455c4ea132b758970c312513c37d (patch) | |
| tree | 03798efb1e31376c1de419a9aceede2478669d7b /drivers | |
| parent | b4cc4aa24ca47b6a2bdb9029020502cff7c6e774 (diff) | |
| download | op-kernel-dev-3908bb1867e7455c4ea132b758970c312513c37d.zip op-kernel-dev-3908bb1867e7455c4ea132b758970c312513c37d.tar.gz | |
[WATCHDOG] sbc8360+w83977f_wdt-consolidate_CONFIG_WATCHDOG_NOWAYOUT_handling
Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess and
replaces it with common define in linux/watchdog.h.
Signed-Off-By: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/watchdog/sbc8360.c | 7 | ||||
| -rw-r--r-- | drivers/char/watchdog/w83977f_wdt.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/char/watchdog/sbc8360.c b/drivers/char/watchdog/sbc8360.c index 06daf42..c6cbf80 100644 --- a/drivers/char/watchdog/sbc8360.c +++ b/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/drivers/char/watchdog/w83977f_wdt.c b/drivers/char/watchdog/w83977f_wdt.c index 366d47b..a7ff64c 100644 --- a/drivers/char/watchdog/w83977f_wdt.c +++ b/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)"); |
