diff options
| author | Roland Dreier | 2005-07-28 04:12:56 +0200 |
|---|---|---|
| committer | Roland Dreier | 2005-07-28 04:12:56 +0200 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /drivers/char/watchdog/mixcomwd.c | |
| parent | [IB/mthca]: Use io_remap_pfn_range for PCI space (diff) | |
| parent | [PATCH] new alpha syscalls (diff) | |
| download | kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.gz kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.xz kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.zip | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'drivers/char/watchdog/mixcomwd.c')
| -rw-r--r-- | drivers/char/watchdog/mixcomwd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c index 3143e4a07535..c9b301dccec3 100644 --- a/drivers/char/watchdog/mixcomwd.c +++ b/drivers/char/watchdog/mixcomwd.c @@ -62,12 +62,7 @@ static int mixcomwd_timer_alive; static struct timer_list mixcomwd_timer = TIMER_INITIALIZER(NULL, 0, 0); static char expect_close; -#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)"); |