projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
drivers
/
watchdog
/
imx2_wdt.c
diff --git
a/drivers/watchdog/imx2_wdt.c
b/drivers/watchdog/imx2_wdt.c
index
cc86018
..
51bfb79
100644
(file)
--- a/
drivers/watchdog/imx2_wdt.c
+++ b/
drivers/watchdog/imx2_wdt.c
@@
-317,6
+317,7
@@
static int __init imx2_wdt_probe(struct platform_device *pdev)
watchdog_set_nowayout(wdog, nowayout);
watchdog_set_restart_priority(wdog, 128);
watchdog_init_timeout(wdog, timeout, dev);
+ watchdog_stop_ping_on_suspend(wdog);
if (imx2_wdt_is_running(wdev)) {
imx2_wdt_set_timeout(wdog, wdog->timeout);