diff options
| author | Lee Jones <lee.jones@linaro.org> | 2014-06-05 11:06:00 -0400 |
|---|---|---|
| committer | Maxime Coquelin <maxime.coquelin@st.com> | 2014-07-21 05:40:50 -0400 |
| commit | a8dc325c7a0b90c1e958336c1f9cdda3d749d065 (patch) | |
| tree | 8ba7e48a2f98bd1a5e2c030472f676e20726dbe9 /arch | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
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 | |||
| 224 | CONFIG_SENSORS_LM90=y | 224 | CONFIG_SENSORS_LM90=y |
| 225 | CONFIG_THERMAL=y | 225 | CONFIG_THERMAL=y |
| 226 | CONFIG_ARMADA_THERMAL=y | 226 | CONFIG_ARMADA_THERMAL=y |
| 227 | CONFIG_ST_THERMAL_SYSCFG=y | ||
| 228 | CONFIG_ST_THERMAL_MEMMAP=y | ||
| 227 | CONFIG_WATCHDOG=y | 229 | CONFIG_WATCHDOG=y |
| 228 | CONFIG_ORION_WATCHDOG=y | 230 | CONFIG_ORION_WATCHDOG=y |
| 229 | CONFIG_SUNXI_WATCHDOG=y | 231 | CONFIG_SUNXI_WATCHDOG=y |