diff options
author | Russell King | 2005-07-28 10:30:20 +0200 |
---|---|---|
committer | Russell King | 2005-07-28 10:30:20 +0200 |
commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/char/watchdog/s3c2410_wdt.c | |
parent | [SERIAL] Convert parport_serial to use new 8250_pci interfaces (diff) | |
parent | [PATCH] new alpha syscalls (diff) | |
download | kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.xz kernel-qcow2-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/char/watchdog/s3c2410_wdt.c')
-rw-r--r-- | drivers/char/watchdog/s3c2410_wdt.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c index 1699d2c28ce5..f85ac898a49a 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/char/watchdog/s3c2410_wdt.c @@ -62,12 +62,7 @@ #define CONFIG_S3C2410_WATCHDOG_ATBOOT (0) #define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME (15) -#ifdef CONFIG_WATCHDOG_NOWAYOUT -static int nowayout = 1; -#else -static int nowayout = 0; -#endif - +static int nowayout = WATCHDOG_NOWAYOUT; static int tmr_margin = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME; static int tmr_atboot = CONFIG_S3C2410_WATCHDOG_ATBOOT; static int soft_noboot = 0; |