diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 19:12:56 -0700 |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 19:12:56 -0700 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /drivers/char/watchdog/machzwd.c | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
| download | kernel_goldelico_gta04-2868bd281fef21d1e73d6b7648a41efc3d75f10c.zip kernel_goldelico_gta04-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.gz kernel_goldelico_gta04-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.bz2 | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'drivers/char/watchdog/machzwd.c')
| -rw-r--r-- | drivers/char/watchdog/machzwd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c index 9da395f..a9a20aa 100644 --- a/drivers/char/watchdog/machzwd.c +++ b/drivers/char/watchdog/machzwd.c @@ -94,12 +94,7 @@ MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); -#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)"); |