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 remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-zoom3.dts
diff --git
a/arch/arm/boot/dts/omap3-zoom3.dts
b/arch/arm/boot/dts/omap3-zoom3.dts
index 131448d86e67bdd4bff337529d01a35e232c6326..7bc5fdd6981e25d76e3409533fbc46238177ce3f 100644
(file)
--- a/
arch/arm/boot/dts/omap3-zoom3.dts
+++ b/
arch/arm/boot/dts/omap3-zoom3.dts
@@
-44,7
+44,7
@@
regulator-name = "vwl1271";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- gpio = <&gpio4 5
0>;
/* gpio101 */
+ gpio = <&gpio4 5
GPIO_ACTIVE_HIGH>;
/* gpio101 */
startup-delay-us = <70000>;
enable-active-high;
};