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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mmc
/
davinci_mmc.txt
diff --git
a/Documentation/devicetree/bindings/mmc/davinci_mmc.txt
b/Documentation/devicetree/bindings/mmc/davinci_mmc.txt
index e5a0140b2381c5663738b82ec3a6970513fe9b20..516fb0143d4c21d1c8e44a8846d55ea5458d7b74 100644
(file)
--- a/
Documentation/devicetree/bindings/mmc/davinci_mmc.txt
+++ b/
Documentation/devicetree/bindings/mmc/davinci_mmc.txt
@@
-24,7
+24,6
@@
mmc0: mmc@1c40000 {
compatible = "ti,da830-mmc",
reg = <0x40000 0x1000>;
interrupts = <16>;
- status = "okay";
bus-width = <4>;
max-frequency = <50000000>;
dmas = <&edma 16