diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-30 14:37:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-30 14:37:43 +1000 |
| commit | bdf242eeb0f69567fe43eba93889d80ecacbfe94 (patch) | |
| tree | dc402eeeb75fd51e92b4f4a63712c6e64ac4c2fb /drivers/char/watchdog/i8xx_tco.c | |
| parent | 836cf0465c422ee6d654060edd7c620d9cf0c09c (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
Merge ../linux-2.6/
Diffstat (limited to 'drivers/char/watchdog/i8xx_tco.c')
| -rw-r--r-- | drivers/char/watchdog/i8xx_tco.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c index 5d07ee59679..f975dab1ddf 100644 --- a/drivers/char/watchdog/i8xx_tco.c +++ b/drivers/char/watchdog/i8xx_tco.c @@ -105,12 +105,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */ module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39, 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)"); |