---

yaml --- r: 296795 b: refs/heads/master c: 59dcf1e h: refs/heads/master i: 296793: 6b99d54 296791: 7d17f3e v: v3
git-mirror · Mar 27, 2012 · 842e278 · 842e278
1 parent 2d98c6d
commit 842e278
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e12a679ddee4eb5ab2f99f7cf129355461e142c0
+refs/heads/master: 59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3
diff --git a/trunk/drivers/watchdog/ep93xx_wdt.c b/trunk/drivers/watchdog/ep93xx_wdt.c
@@ -139,6 +139,7 @@ static int __devinit ep93xx_wdt_probe(struct platform_device *pdev)
 
 	val = readl(mmio_base + EP93XX_WATCHDOG);
 	ep93xx_wdt_wdd.bootstatus = (val & 0x01) ? WDIOF_CARDRESET : 0;
+	ep93xx_wdt_wdd.timeout = timeout;
 
 	watchdog_set_nowayout(&ep93xx_wdt_wdd, nowayout);