summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorEvan Wilson <evan@oliodevices.com>2016-01-20 02:03:22 +0000
committerGerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal>2015-04-16 10:08:13 +0000
commitabacadb5d345588fc7915045591e11d1f9250e64 (patch)
tree8cf9dee54eea519a57a218a877df7d5b0d45c8d2 /arch
parentdc2b98fe53437466ad39ab4da540e09a96cfdbdc (diff)
parent49c7b2a6eb962e4692fb18dd064da48c7be40208 (diff)
downloadolio-linux-3.10-abacadb5d345588fc7915045591e11d1f9250e64.tar.xz
olio-linux-3.10-abacadb5d345588fc7915045591e11d1f9250e64.zip
Merge "SW reset the Accelerometer if it's in a bad state. Check this on every resume" into android-3.10-bringup
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/omap3_h1.dts1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index 326b3ffd486..e82008f9b87 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -386,7 +386,6 @@
regulator-name = "vaccel";
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
- regulator-always-on;
};
/* vdig2_reg: regulator@6 {}; unused */