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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mmc
/
fsl-imx-esdhc.txt
diff --git
a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
index c7e404b3ef0515b5527583cae877ab48c5d69595..fea541ee8b34a18fbf1aaef9276c17ef992db830 100644
(file)
--- a/
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
+++ b/
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
@@
-29,6
+29,6
@@
esdhc@70008000 {
compatible = "fsl,imx51-esdhc";
reg = <0x70008000 0x4000>;
interrupts = <2>;
- cd-gpios = <&gpio
0
6 0>; /* GPIO1_6 */
- wp-gpios = <&gpio
0
5 0>; /* GPIO1_5 */
+ cd-gpios = <&gpio
1
6 0>; /* GPIO1_6 */
+ wp-gpios = <&gpio
1
5 0>; /* GPIO1_5 */
};