From: Riku Voipio Date: Sat, 31 May 2014 11:50:26 +0000 (+0300) Subject: thermal: allow building dove_thermal with mvebu X-Git-Tag: v3.17-rc1~46^2^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3dee3905c19d4897386ee0282004b9723a7b6c9;p=karo-tx-linux.git thermal: allow building dove_thermal with mvebu DT-enabled Dove has moved from ARCH_DOVE in mach-dove to MACH_DOVE in mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new DT-only MACH_DOVE to thermal Kconfig. This was originally supposed to go in via "ARM: dove: prepare new Dove DT Kconfig" patch from Sebastian Hesselbarth for 3.15, but slipped through the cracks. I've tested on CuBox that without this patch you can't compile dove_thermal into a mach-mvebu based kernel, and with this patch I can build the driver and it works as expected run-time. v2: non-ascii char creeped in somehow Signed-off-by: Riku Voipio Cc: Sebastian Hesselbarth Cc: Zhang Rui Cc: Eduardo Valentin Cc: linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Acked-by: Sebastian Hesselbarth Signed-off-by: Zhang Rui --- diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index f9a13867cb70..589ac1ab5605 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL config DOVE_THERMAL tristate "Temperature sensor on Marvell Dove SoCs" - depends on ARCH_DOVE + depends on ARCH_DOVE || MACH_DOVE depends on OF help Support for the Dove thermal sensor driver in the Linux thermal