diff options
| author | Dave Jones <davej@redhat.com> | 2005-08-17 22:56:07 -0700 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-08-17 22:56:07 -0700 |
| commit | a8b3e6f10f08f66ae1072efd087b30966a3654f6 (patch) | |
| tree | 1d1409855f8ad5beabafe061c6453edd84ba94c8 /drivers/char/watchdog/wdt977.c | |
| parent | 46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (diff) | |
| parent | 099d44e869f1886b5eb02a5145ca97b5e4142e28 (diff) | |
| download | kernel_samsung_crespo-a8b3e6f10f08f66ae1072efd087b30966a3654f6.zip kernel_samsung_crespo-a8b3e6f10f08f66ae1072efd087b30966a3654f6.tar.gz kernel_samsung_crespo-a8b3e6f10f08f66ae1072efd087b30966a3654f6.tar.bz2 | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/watchdog/wdt977.c')
| -rw-r--r-- | drivers/char/watchdog/wdt977.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/wdt977.c b/drivers/char/watchdog/wdt977.c index 072e9b2..44d49df 100644 --- a/drivers/char/watchdog/wdt977.c +++ b/drivers/char/watchdog/wdt977.c @@ -53,12 +53,7 @@ MODULE_PARM_DESC(timeout,"Watchdog timeout in seconds (60..15300), default=" __M module_param(testmode, int, 0); MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0"); -#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)"); |