commit 48d9fdf68e6c13a21aaf702dad3c1694712253a1
author Linux Build Service Account <lnxbuild@localhost> Sun Sep 09 03:17:41 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Sep 09 03:17:41 2012 -0700
tree 02d11697888a8ba8112f2d3b0f35420391636de3
parent 7459f55a04d463eaa13064f4ad9716abf4c583de
parent 6a2454d615f771332734974ef1557cf957a837f1

Merge "defconfig: msm8974: Enable VADC and IADC peripheral" into msm-3.4

arch/arm/configs/msm8974_defconfig

diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index 8d82973..e5a2f2d 100644
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -169,7 +169,9 @@
 CONFIG_GPIO_QPNP_PIN_DEBUG=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_MSM is not set
-# CONFIG_HWMON is not set
+CONFIG_HWMON=y
+CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
+CONFIG_SENSORS_QPNP_ADC_CURRENT=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_TSENS8974=y
 CONFIG_REGULATOR_STUB=y