redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[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>
hifive-unleashed-5.1
Wim Van Sebroeck 2005-09-11 23:58:22 +02:00
parent b4cc4aa24c
commit 3908bb1867
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/watchdog/sbc8360.c
View File

@ -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))");

7
drivers/char/watchdog/w83977f_wdt.c
View File

@ -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)");