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 'nfs-for-4.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
dma
/
ste-dma40.txt
diff --git
a/Documentation/devicetree/bindings/dma/ste-dma40.txt
b/Documentation/devicetree/bindings/dma/ste-dma40.txt
index 95800ab37bb00cce3fdfe2278625e6ba47cdec69..aa7dbd565ad0edddc0021b02c8f9d44e7f6b7438 100644
(file)
--- a/
Documentation/devicetree/bindings/dma/ste-dma40.txt
+++ b/
Documentation/devicetree/bindings/dma/ste-dma40.txt
@@
-135,5
+135,4
@@
Example:
<&dma 13 0 0x0>; /* Logical - MemToDev */
dma-names = "rx", "rx";
- status = "disabled";
};