aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/sbc8360.c7
-rw-r--r--drivers/char/watchdog/w83977f_wdt.c7
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/char/watchdog/sbc8360.c b/drivers/char/watchdog/sbc8360.c
index 06daf426d5b6..c6cbf808d8c2 100644
--- a/drivers/char/watchdog/sbc8360.c
+++ b/drivers/char/watchdog/sbc8360.c
@@ -199,12 +199,7 @@ static int wd_times[64][2] = {
199static int timeout = 27; 199static int timeout = 27;
200static int wd_margin = 0xB; 200static int wd_margin = 0xB;
201static int wd_multiplier = 2; 201static int wd_multiplier = 2;
202 202static int nowayout = WATCHDOG_NOWAYOUT;
203#ifdef CONFIG_WATCHDOG_NOWAYOUT
204static int nowayout = 1;
205#else
206static int nowayout = 0;
207#endif
208 203
209module_param(timeout, int, 27); 204module_param(timeout, int, 27);
210MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); 205MODULE_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 366d47bca16e..a7ff64c8921f 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
58module_param(testmode, int, 0); 58module_param(testmode, int, 0);
59MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0"); 59MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0");
60 60
61#ifdef CONFIG_WATCHDOG_NOWAYOUT 61static int nowayout = WATCHDOG_NOWAYOUT;
62static int nowayout = 1;
63#else
64static int nowayout = 0;
65#endif
66
67module_param(nowayout, int, 0); 62module_param(nowayout, int, 0);
68MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); 63MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
69 64