Merge tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore

[karo-tx-linux.git] / arch / arm / configs / kirkwood_defconfig

diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 93f3794ba5cb8d66c0db6cb1ba393ed2710f1552..3d8667f648b8873694cae26be8ac3bf4594f2839 100644 (file)
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -118,6 +118,8 @@ CONFIG_SPI=y
 CONFIG_SPI_ORION=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_KIRKWOOD_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
 CONFIG_HID_DRAGONRISE=y