diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
| commit | ac98695d6c1508b724f246f38ce57fb4e3cec356 (patch) | |
| tree | 189969a3689b9b83eaf39314a7942cc781ff836b /drivers/char/watchdog/softdog.c | |
| parent | d9bc125caf592b7d081021f32ce5b717efdf70c8 (diff) | |
| parent | 93bbad8fe13a25dcf7f3bc628a71d1a7642ae61b (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/char/watchdog/softdog.c')
| -rw-r--r-- | drivers/char/watchdog/softdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c index 4067e1f8a368..9c3694909243 100644 --- a/drivers/char/watchdog/softdog.c +++ b/drivers/char/watchdog/softdog.c | |||
| @@ -59,7 +59,7 @@ MODULE_PARM_DESC(soft_margin, "Watchdog soft_margin in seconds. (0<soft_margin<6 | |||
| 59 | 59 | ||
| 60 | static int nowayout = WATCHDOG_NOWAYOUT; | 60 | static int nowayout = WATCHDOG_NOWAYOUT; |
| 61 | module_param(nowayout, int, 0); | 61 | module_param(nowayout, int, 0); |
| 62 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); | 62 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
| 63 | 63 | ||
| 64 | #ifdef ONLY_TESTING | 64 | #ifdef ONLY_TESTING |
| 65 | static int soft_noboot = 1; | 65 | static int soft_noboot = 1; |