diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-02-13 23:24:34 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-02-13 23:24:34 +0100 |
| commit | 88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d (patch) | |
| tree | 0ff6ddf9d7ba817f62d51c94a2db333f22880501 /drivers/char/watchdog/softdog.c | |
| parent | 9af9fc45ddd3e315c51f87392b5048967e4343cd (diff) | |
| parent | 82eb7c5059de64bd43f6b3cf3f128470f2b3fb83 (diff) | |
Merge ../linux-2.6-watchdog-mm
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 4067e1f8a36..9c369490924 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 static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); -MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); #ifdef ONLY_TESTING static int soft_noboot = 1; |