summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/dove_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-17 23:26:57 -0700
committerOlof Johansson <olof@lixom.net>2013-04-17 23:27:52 -0700
commitdb39ad7d418b3b64f92295c3d9d7d8595ff68f08 (patch)
tree5357280b5edf0a5ddac4da422447f00bcf5c5190 /arch/arm/configs/dove_defconfig
parentbf049ded36b2178e80bb9f227d4490714d838c11 (diff)
parent74898364e717c6bd939bb88d95049fc91d2b4950 (diff)
downloadop-kernel-dev-db39ad7d418b3b64f92295c3d9d7d8595ff68f08.zip
op-kernel-dev-db39ad7d418b3b64f92295c3d9d7d8595ff68f08.tar.gz
Merge tag 'dt-3.10-4' of git://git.infradead.org/users/jcooper/linux into next/dt2
From Jason Cooper: mvebu dt for v3.10 round 4 - mvebu LPAE 64bit dts file changes * tag 'dt-3.10-4' of git://git.infradead.org/users/jcooper/linux: (52 commits) ARM: dts: mvebu: Convert mvebu device tree files to 64 bits ARM: dts: mvebu: introduce internal-regs node ARM: dts: mvebu: Convert all the mvebu files to use the range property ARM: dts: mvebu: move all peripherals inside soc ARM: dts: mvebu: fix cpus section indentation arm: mvebu: PCIe Device Tree informations for Armada XP GP arm: mvebu: PCIe Device Tree informations for Armada 370 DB arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox arm: mvebu: PCIe Device Tree informations for Armada XP DB arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4 arm: mvebu: add PCIe Device Tree informations for Armada XP arm: mvebu: add PCIe Device Tree informations for Armada 370 ARM: mvebu: Align the internal registers virtual base to support LPAE ARM: mvebu: Limit the DMA zone when LPAE is selected arm: plat-orion: remove addr-map code arm: mach-mv78xx0: convert to use the mvebu-mbus driver arm: mach-orion5x: convert to use mvebu-mbus driver arm: mach-dove: convert to use mvebu-mbus driver arm: mach-kirkwood: convert to use mvebu-mbus driver arm: mach-mvebu: convert to use mvebu-mbus driver ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/dove_defconfig')
-rw-r--r--arch/arm/configs/dove_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 3fe8dae..4364eff 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -75,6 +75,8 @@ CONFIG_I2C_MV64XXX=y
CONFIG_SPI=y
CONFIG_SPI_ORION=y
# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_DOVE_THERMAL=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
OpenPOWER on IntegriCloud