From: Wim Van Sebroeck on
Hi Linus,

Please pull from 'master' branch of
or if hasn't synced up yet:

This will update the following files:

drivers/watchdog/ep93xx_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

with these Changes:

Author: Wim Van Sebroeck <wim(a)>
Date: Mon May 3 08:58:56 2010 +0000

watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.

The WATCHDOG_TIMEOUT macro does not exist. The default timeout value is WDT_TIMEOUT.
Fix the MODULE_PARM_DESC so that the code can compile again.

reported-by: Randy Dunlap <randy.dunlap(a)>
Signed-off-by: Wim Van Sebroeck <wim(a)>

The Changes can also be looked at on:;a=summary

For completeness, I added the overal diff below.


diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 88ed54e..59359c9 100644
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -244,7 +244,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
module_param(timeout, int, 0);
"Watchdog timeout in seconds. (1<=timeout<=3600, default="

MODULE_AUTHOR("Ray Lehtiniemi <rayl(a)>,"
"Alessandro Zummo <a.zummo(a)>");
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at