summaryrefslogtreecommitdiff
path: root/drivers/char/watchdog/wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-02-13 22:24:34 (GMT)
committerWim Van Sebroeck <wim@iguana.be>2007-02-13 22:24:34 (GMT)
commit88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d (patch)
tree0ff6ddf9d7ba817f62d51c94a2db333f22880501 /drivers/char/watchdog/wdt.c
parent9af9fc45ddd3e315c51f87392b5048967e4343cd (diff)
parent82eb7c5059de64bd43f6b3cf3f128470f2b3fb83 (diff)
downloadlinux-fsl-qoriq-88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d.tar.xz
Merge ../linux-2.6-watchdog-mm
Diffstat (limited to 'drivers/char/watchdog/wdt.c')
-rw-r--r--drivers/char/watchdog/wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c
index 517fbd8..0a3de6a 100644
--- a/drivers/char/watchdog/wdt.c
+++ b/drivers/char/watchdog/wdt.c
@@ -64,7 +64,7 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536,
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) ")");
/* You must set these - there is no sane way to probe for this board. */
static int io=0x240;