commit 195dfd27a46f65cd41f75d5b7377a1039e84a5ec
author Linux Build Service Account <lnxbuild@localhost> Thu Dec 06 19:56:28 2012 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 06 19:56:28 2012 -0800
tree d499a4a7243018d380736d07b53758515b6034f3
parent 8885bb068c9add2be3690fe57ebb49b0df9d94e3
parent d7cce0524d87a39b7ae7caacfe7cc47cfac6babf

Merge "defconfig: msm8974: Enable kernel thermal mitigation"

arch/arm/configs/msm8974-perf_defconfig

diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig
index 71e83f6..2c1b8f9 100644
--- a/arch/arm/configs/msm8974-perf_defconfig
+++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -283,6 +283,7 @@
 CONFIG_SENSORS_QPNP_ADC_CURRENT=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_TSENS8974=y
+CONFIG_THERMAL_MONITOR=y
 CONFIG_THERMAL_QPNP=y
 CONFIG_WCD9320_CODEC=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y

arch/arm/configs/msm8974_defconfig

diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index ffcc83f..43e2c2b 100644
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -285,6 +285,7 @@
 CONFIG_SENSORS_QPNP_ADC_CURRENT=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_TSENS8974=y
+CONFIG_THERMAL_MONTIOR=y
 CONFIG_THERMAL_QPNP=y
 CONFIG_WCD9320_CODEC=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y