From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 5 Jun 2014 15:06:00 +0000 (+0200)
Subject: ARM: multi_v7_defconfig: Configure in ST's Thermal Controller
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a8dc325c7a0b90c1e958336c1f9cdda3d749d065;p=deliverable%2Flinux.git

ARM: multi_v7_defconfig: Configure in ST's Thermal Controller

Signed-off-by: Ajit Pal Singh <ajitpal.singh@st.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
---

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 534836497998..929296fad041 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -224,6 +224,8 @@ CONFIG_POWER_RESET_SUN6I=y
 CONFIG_SENSORS_LM90=y
 CONFIG_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
+CONFIG_ST_THERMAL_SYSCFG=y
+CONFIG_ST_THERMAL_MEMMAP=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y