summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>2013-03-26 07:16:28 -0300
committerJason Cooper <jason@lakedaemon.net>2013-04-03 02:47:37 +0000
commitfb20601a660dbc2c94c5e23a67e0852132d5a2e7 (patch)
treeb000f3ead1bdd17ea1268124e1ff1504425be647 /arch/arm/configs
parenta10837ba09fdb3ddb781dae2efc30dc5c4ec5cc1 (diff)
ARM: configs: Update mvebu defconfig for thermal
The thermal management driver for Armada XP/370 has been added so we update the defconfig to reflect this. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/mvebu_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 2ec8119cff73..fc7e8beb1efe 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -49,6 +49,8 @@ CONFIG_MTD_M25P80=y
CONFIG_SERIAL_8250_DW=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
+CONFIG_THERMAL=y
+CONFIG_ARMADA_THERMAL=y
CONFIG_USB_SUPPORT=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y