git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.31-rc1' into dmaengine
[pandora-kernel.git]
/
drivers
/
watchdog
/
at91sam9_wdt.c
diff --git
a/drivers/watchdog/at91sam9_wdt.c
b/drivers/watchdog/at91sam9_wdt.c
index
435b057
..
eac2602
100644
(file)
--- a/
drivers/watchdog/at91sam9_wdt.c
+++ b/
drivers/watchdog/at91sam9_wdt.c
@@
-156,7
+156,8
@@
static int at91_wdt_settimeout(unsigned int timeout)
static const struct watchdog_info at91_wdt_info = {
.identity = DRV_NAME,
- .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+ WDIOF_MAGICCLOSE,
};
/*