diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /drivers/char/watchdog/sc1200wdt.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/char/watchdog/sc1200wdt.c')
| -rw-r--r-- | drivers/char/watchdog/sc1200wdt.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c index 24401e84729e..515ce7572049 100644 --- a/drivers/char/watchdog/sc1200wdt.c +++ b/drivers/char/watchdog/sc1200wdt.c | |||
| @@ -91,12 +91,7 @@ MODULE_PARM_DESC(io, "io port"); | |||
| 91 | module_param(timeout, int, 0); | 91 | module_param(timeout, int, 0); |
| 92 | MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1"); | 92 | MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1"); |
| 93 | 93 | ||
| 94 | #ifdef CONFIG_WATCHDOG_NOWAYOUT | 94 | static int nowayout = WATCHDOG_NOWAYOUT; |
| 95 | static int nowayout = 1; | ||
| 96 | #else | ||
| 97 | static int nowayout = 0; | ||
| 98 | #endif | ||
| 99 | |||
| 100 | module_param(nowayout, int, 0); | 95 | module_param(nowayout, int, 0); |
| 101 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); | 96 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); |
| 102 | 97 | ||