commit e20fe8127c563986517a08c7609d5af9e2906ed8
author Linux Build Service Account <lnxbuild@localhost> Wed Dec 12 00:36:09 2012 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Dec 12 00:36:08 2012 -0800
tree 4534848eda7f1e91e074b53686fbe318c0040abf
parent dabe2205eeb5445aee30b47ca76fdb0c204f72d1
parent e23c5f643a90e9fbe3810b13490a9d1c25eb1ec5

Merge "defconfig: msm8974: Enable VADC_TM"

arch/arm/configs/msm8974-perf_defconfig

diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig
index 94e2f36..c534bef 100644
--- a/arch/arm/configs/msm8974-perf_defconfig
+++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -286,6 +286,7 @@
 CONFIG_THERMAL_TSENS8974=y
 CONFIG_THERMAL_MONITOR=y
 CONFIG_THERMAL_QPNP=y
+CONFIG_THERMAL_QPNP_ADC_TM=y
 CONFIG_WCD9320_CODEC=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_STUB=y

arch/arm/configs/msm8974_defconfig

diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index 0428362..8e0dadb 100644
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -290,6 +290,7 @@
 CONFIG_THERMAL_QPNP=y
 CONFIG_WCD9320_CODEC=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_THERMAL_QPNP_ADC_TM=y
 CONFIG_REGULATOR_STUB=y
 CONFIG_REGULATOR_QPNP=y
 CONFIG_MEDIA_SUPPORT=y