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 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-devkit8000-common.dtsi
diff --git
a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index 82aa9c4a0f1c331f54c70409993ee17bdc493d00..0c0bb1b01b0ba004af0afbb5c5b4fca099a57055 100644
(file)
--- a/
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@
-149,7
+149,7
@@
&mmc1 {
vmmc-supply = <&vmmc1>;
- v
mmc_aux
-supply = <&vsim>;
+ v
qmmc
-supply = <&vsim>;
bus-width = <8>;
};