diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 09:03:36 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 09:03:36 -0500 |
| commit | da28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch) | |
| tree | b3ff509f21352ef053cb3d490cb13528090d32ac /drivers/char/watchdog/wdt.c | |
| parent | 6de7dc2c4c713d037c19aa1e310d240f16973414 (diff) | |
| parent | 577a4f8102d54b504cb22eb021b89e957e8df18f (diff) | |
| download | linux-rt-da28c12089dfcfb8695b6b555cdb8e03dda2b690.tar.gz | |
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/char/watchdog/wdt.c')
| -rw-r--r-- | drivers/char/watchdog/wdt.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c index 1210ca0c425b..ec7e401228ee 100644 --- a/drivers/char/watchdog/wdt.c +++ b/drivers/char/watchdog/wdt.c @@ -63,12 +63,7 @@ static int wd_heartbeat; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WD_TIMO) ")"); -#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)"); |