diff options
author | Russell King | 2005-07-28 10:30:20 +0200 |
---|---|---|
committer | Russell King | 2005-07-28 10:30:20 +0200 |
commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/char/watchdog/pcwd.c | |
parent | [SERIAL] Convert parport_serial to use new 8250_pci interfaces (diff) | |
parent | [PATCH] new alpha syscalls (diff) | |
download | kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.xz kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/char/watchdog/pcwd.c')
-rw-r--r-- | drivers/char/watchdog/pcwd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c index 6ebce3f2ef9c..427ad51b7a35 100644 --- a/drivers/char/watchdog/pcwd.c +++ b/drivers/char/watchdog/pcwd.c @@ -146,12 +146,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<=heartbeat<=7200, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); -#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)"); |