aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/watchdog/sc520_wdt.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-30 18:14:50 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-07-30 18:14:50 -0400
commitde745fb27983770ebfdeaa70f8a36f791fb33786 (patch)
tree701555a1a7a2a5ff9a6c67896cf1ea089597750e /drivers/char/watchdog/sc520_wdt.c
parent08cd84c81f27d5bd22ba958b7cae6d566c509280 (diff)
parenta670fcb43f01a67ef56176afc76e5d43d128b25c (diff)
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/char/watchdog/sc520_wdt.c')
-rw-r--r--drivers/char/watchdog/sc520_wdt.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
index f6d143e1900..72501be79b0 100644
--- a/drivers/char/watchdog/sc520_wdt.c
+++ b/drivers/char/watchdog/sc520_wdt.c
@@ -94,12 +94,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ t
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
-#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)");