From 842e278ed8ab8d8684f7132301045dec03d4d5af Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Sun, 18 Mar 2012 13:09:52 +0200 Subject: [PATCH] --- yaml --- r: 296795 b: refs/heads/master c: 59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3 h: refs/heads/master i: 296793: 6b99d548289567968c15acbfdd14a860c4116d3f 296791: 7d17f3e77df668f170982c33a63c5c625f1735c8 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/ep93xx_wdt.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e3d3fe1a33bd..e4068c825178 100644 --- 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 index 414ce8fdecc9..29575f8228bd 100644 --- 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);