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 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
clock
/
renesas,cpg-mssr.txt
diff --git
a/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
b/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
index 27cec325853852fc1a5360cefd06f1fded968a13..316e136865688b7c4fe0c6f1d7b23934d66634d1 100644
(file)
--- a/
Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
+++ b/
Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
@@
-82,5
+82,4
@@
Examples
dma-names = "tx", "rx";
power-domains = <&cpg>;
resets = <&cpg 310>;
- status = "disabled";
};