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 branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
dma
/
sun4i-dma.txt
diff --git
a/Documentation/devicetree/bindings/dma/sun4i-dma.txt
b/Documentation/devicetree/bindings/dma/sun4i-dma.txt
index f1634a27a8300fc15de7fbff9a897ed987d7cd3b..3b484380c56a9ff468421667d5703bb29d1dc587 100644
(file)
--- a/
Documentation/devicetree/bindings/dma/sun4i-dma.txt
+++ b/
Documentation/devicetree/bindings/dma/sun4i-dma.txt
@@
-40,7
+40,6
@@
Example:
clock-names = "ahb", "mod";
dmas = <&dma 1 29>, <&dma 1 28>;
dma-names = "rx", "tx";
- status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};