diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2005-09-11 17:58:22 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2005-09-12 03:37:41 -0400 |
| commit | 3908bb1867e7455c4ea132b758970c312513c37d (patch) | |
| tree | 03798efb1e31376c1de419a9aceede2478669d7b /drivers/char/watchdog/sbc8360.c | |
| parent | b4cc4aa24ca47b6a2bdb9029020502cff7c6e774 (diff) | |
[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.c | 7 |
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] = { | |||
| 199 | static int timeout = 27; | 199 | static int timeout = 27; |
| 200 | static int wd_margin = 0xB; | 200 | static int wd_margin = 0xB; |
| 201 | static int wd_multiplier = 2; | 201 | static int wd_multiplier = 2; |
| 202 | 202 | static int nowayout = WATCHDOG_NOWAYOUT; | |
| 203 | #ifdef CONFIG_WATCHDOG_NOWAYOUT | ||
| 204 | static int nowayout = 1; | ||
| 205 | #else | ||
| 206 | static int nowayout = 0; | ||
| 207 | #endif | ||
| 208 | 203 | ||
| 209 | module_param(timeout, int, 27); | 204 | module_param(timeout, int, 27); |
| 210 | MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); | 205 | MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); |