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 'rtc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
dma
/
fsl-edma.txt
diff --git
a/Documentation/devicetree/bindings/dma/fsl-edma.txt
b/Documentation/devicetree/bindings/dma/fsl-edma.txt
index 191d7bd8a6fefd412ce4e63f8e4e49401bcbbc82..97e213e07660816a2f81d19f400b104e09b1fe90 100644
(file)
--- a/
Documentation/devicetree/bindings/dma/fsl-edma.txt
+++ b/
Documentation/devicetree/bindings/dma/fsl-edma.txt
@@
-72,5
+72,4
@@
sai2: sai@40031000 {
dma-names = "tx", "rx";
dmas = <&edma0 0 21>,
<&edma0 0 20>;
- status = "disabled";
};