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 'secureexec-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
watchdog
/
marvel.txt
diff --git
a/Documentation/devicetree/bindings/watchdog/marvel.txt
b/Documentation/devicetree/bindings/watchdog/marvel.txt
index 858ed9221ac4d65d77ddc8537c2761995527af52..c1b67a78f00c770109bdf0b80059e401413b80ef 100644
(file)
--- a/
Documentation/devicetree/bindings/watchdog/marvel.txt
+++ b/
Documentation/devicetree/bindings/watchdog/marvel.txt
@@
-41,6
+41,5
@@
Example:
reg = <0x20300 0x28>, <0x20108 0x4>;
interrupts = <3>;
timeout-sec = <10>;
- status = "okay";
clocks = <&gate_clk 7>;
};