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/ixp4xx_wdt.c | |
| parent | 836cf0465c422ee6d654060edd7c620d9cf0c09c (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
| download | op-kernel-dev-bdf242eeb0f69567fe43eba93889d80ecacbfe94.zip op-kernel-dev-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.gz | |
Merge ../linux-2.6/
Diffstat (limited to 'drivers/char/watchdog/ixp4xx_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/ixp4xx_wdt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c index 83df369..8d916af 100644 --- a/drivers/char/watchdog/ixp4xx_wdt.c +++ b/drivers/char/watchdog/ixp4xx_wdt.c @@ -27,11 +27,7 @@ #include <asm/hardware.h> #include <asm/uaccess.h> -#ifdef CONFIG_WATCHDOG_NOWAYOUT -static int nowayout = 1; -#else -static int nowayout = 0; -#endif +static int nowayout = WATCHDOG_NOWAYOUT; static int heartbeat = 60; /* (secs) Default is 1 minute */ static unsigned long wdt_status; static unsigned long boot_status; |
