summaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/w83977f_wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck2005-09-11 23:58:22 +0200
committerWim Van Sebroeck2005-09-12 09:37:41 +0200
commit3908bb1867e7455c4ea132b758970c312513c37d (patch)
tree03798efb1e31376c1de419a9aceede2478669d7b /drivers/char/watchdog/w83977f_wdt.c
parent[WATCHDOG] w83977f-watchdog-driver.patch (diff)
downloadkernel-qcow2-linux-3908bb1867e7455c4ea132b758970c312513c37d.tar.gz
kernel-qcow2-linux-3908bb1867e7455c4ea132b758970c312513c37d.tar.xz
kernel-qcow2-linux-3908bb1867e7455c4ea132b758970c312513c37d.zip
[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/char/watchdog/w83977f_wdt.c')
-rw-r--r--drivers/char/watchdog/w83977f_wdt.c7
1 files changed, 1 insertions, 6 deletions
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
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)");