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 commits 'ca6a42586fae' and 'c286c419c784' into perf/urgent
[pandora-kernel.git]
/
drivers
/
watchdog
/
bcm47xx_wdt.c
diff --git
a/drivers/watchdog/bcm47xx_wdt.c
b/drivers/watchdog/bcm47xx_wdt.c
index
5f24552
..
bd44417
100644
(file)
--- a/
drivers/watchdog/bcm47xx_wdt.c
+++ b/
drivers/watchdog/bcm47xx_wdt.c
@@
-150,8
+150,8
@@
static ssize_t bcm47xx_wdt_write(struct file *file, const char __user *data,
}
static const struct watchdog_info bcm47xx_wdt_info = {
- .identity = DRV_NAME,
- .options = WDIOF_SETTIMEOUT |
+ .identity = DRV_NAME,
+ .options = WDIOF_SETTIMEOUT |
WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE,
};