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 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mmc
/
mmc.txt
diff --git
a/Documentation/devicetree/bindings/mmc/mmc.txt
b/Documentation/devicetree/bindings/mmc/mmc.txt
index c7f4a0ec48eda788359a06ce07e6330d932da9d5..b32ade645ad97cbc655dbd0b53b7a998905d6f7f 100644
(file)
--- a/
Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/
Documentation/devicetree/bindings/mmc/mmc.txt
@@
-153,7
+153,6
@@
mmc3: mmc@01c12000 {
bus-width = <4>;
non-removable;
mmc-pwrseq = <&sdhci0_pwrseq>
- status = "okay";
brcmf: bcrmf@1 {
reg = <1>;