summaryrefslogtreecommitdiff
path: root/drivers/char/watchdog/sbc8360.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2005-09-12 01:58:22 +0400
committerWim Van Sebroeck <wim@iguana.be>2005-09-12 11:37:41 +0400
commit3908bb1867e7455c4ea132b758970c312513c37d (patch)
tree03798efb1e31376c1de419a9aceede2478669d7b /drivers/char/watchdog/sbc8360.c
parentb4cc4aa24ca47b6a2bdb9029020502cff7c6e774 (diff)
downloadlinux-3908bb1867e7455c4ea132b758970c312513c37d.tar.xz
[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/sbc8360.c')
-rw-r--r--drivers/char/watchdog/sbc8360.c7
1 files changed, 1 insertions, 6 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] = {
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))");