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/smsc37b787_wdt.c | |
parent | 9af9fc45ddd3e315c51f87392b5048967e4343cd (diff) | |
parent | 82eb7c5059de64bd43f6b3cf3f128470f2b3fb83 (diff) | |
download | op-kernel-dev-88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d.zip op-kernel-dev-88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d.tar.gz |
Merge ../linux-2.6-watchdog-mm
Diffstat (limited to 'drivers/char/watchdog/smsc37b787_wdt.c')
-rw-r--r-- | drivers/char/watchdog/smsc37b787_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/smsc37b787_wdt.c b/drivers/char/watchdog/smsc37b787_wdt.c index 9f56913..aa977f1 100644 --- a/drivers/char/watchdog/smsc37b787_wdt.c +++ b/drivers/char/watchdog/smsc37b787_wdt.c @@ -624,4 +624,4 @@ module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "range is 1-255 units, default is 60"); 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) ")"); |