git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
watchdog
/
atmel-sama5d4-wdt.txt
diff --git
a/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt
b/Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt
index f7cc7c0609107d6f94de076af38f84590f175896..4fec1e3725b44c1d3e9731a9040e884abe1df5c2 100644
(file)
--- a/
Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt
+++ b/
Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt
@@
-31,5
+31,4
@@
Example:
atmel,watchdog-type = "hardware";
atmel,dbg-halt;
atmel,idle-halt;
- status = "okay";
};