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/jikos/hid
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-tao3530.dtsi
diff --git
a/arch/arm/boot/dts/omap3-tao3530.dtsi
b/arch/arm/boot/dts/omap3-tao3530.dtsi
index 06ac0f80bcf083ad0b4ed6a0cb30bcf64b22e7c5..9a601d15247bef5da1519db88b1680b119381b6d 100644
(file)
--- a/
arch/arm/boot/dts/omap3-tao3530.dtsi
+++ b/
arch/arm/boot/dts/omap3-tao3530.dtsi
@@
-223,7
+223,7
@@
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&vmmc1>;
- v
mmc_aux
-supply = <&vsim>;
+ v
qmmc
-supply = <&vsim>;
cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;
bus-width = <8>;
};