thermal: allow building dove_thermal with mvebu
authorRiku Voipio <[email protected]>
Sat, 31 May 2014 11:50:26 +0000 (14:50 +0300)
committerZhang Rui <[email protected]>
Tue, 15 Jul 2014 14:25:11 +0000 (22:25 +0800)
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 <[email protected]>
Cc: Sebastian Hesselbarth <[email protected]>
Cc: Zhang Rui <[email protected]>
Cc: Eduardo Valentin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Acked-by: Sebastian Hesselbarth <[email protected]>
Signed-off-by: Zhang Rui <[email protected]>
drivers/thermal/Kconfig

index f9a13867cb70df87fa58aa48a86645eddbefd9c8..589ac1ab560570b24527d7001c617c8e43239421 100644 (file)
@@ -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