diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-02-13 17:24:34 -0500 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-02-13 17:24:34 -0500 |
| commit | 88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d (patch) | |
| tree | 0ff6ddf9d7ba817f62d51c94a2db333f22880501 /drivers/char/watchdog/sbc8360.c | |
| parent | 9af9fc45ddd3e315c51f87392b5048967e4343cd (diff) | |
| parent | 82eb7c5059de64bd43f6b3cf3f128470f2b3fb83 (diff) | |
Merge ../linux-2.6-watchdog-mm
Diffstat (limited to 'drivers/char/watchdog/sbc8360.c')
| -rw-r--r-- | drivers/char/watchdog/sbc8360.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/sbc8360.c b/drivers/char/watchdog/sbc8360.c index 41fc6f80c493..67ae42685e75 100644 --- a/drivers/char/watchdog/sbc8360.c +++ b/drivers/char/watchdog/sbc8360.c | |||
| @@ -204,7 +204,7 @@ module_param(timeout, int, 0); | |||
| 204 | MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); | 204 | MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); |
| 205 | module_param(nowayout, int, 0); | 205 | module_param(nowayout, int, 0); |
| 206 | MODULE_PARM_DESC(nowayout, | 206 | MODULE_PARM_DESC(nowayout, |
| 207 | "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); | 207 | "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
| 208 | 208 | ||
| 209 | /* | 209 | /* |
| 210 | * Kernel methods. | 210 | * Kernel methods. |