Merge tag 'berlin-fixes-for-3.19-1' of git://git.infradead.org/users/hesselba/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / thermal / Makefile

diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 39c4fe87da2f838b63af97518826fdba863f36d0..fa0dc486790f9eb55e4b592735264affc6d75292 100644 (file)
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -18,8 +18,12 @@ thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE) += user_space.o
 # cpufreq cooling
 thermal_sys-$(CONFIG_CPU_THERMAL)      += cpu_cooling.o
 
+# clock cooling
+thermal_sys-$(CONFIG_CLOCK_THERMAL)    += clock_cooling.o
+
 # platform thermal drivers
 obj-$(CONFIG_SPEAR_THERMAL)    += spear_thermal.o
+obj-$(CONFIG_ROCKCHIP_THERMAL) += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)     += rcar_thermal.o
 obj-$(CONFIG_KIRKWOOD_THERMAL)  += kirkwood_thermal.o
 obj-y                          += samsung/
@@ -34,3 +38,4 @@ obj-$(CONFIG_INTEL_SOC_DTS_THERMAL)   += intel_soc_dts_thermal.o
 obj-$(CONFIG_TI_SOC_THERMAL)   += ti-soc-thermal/
 obj-$(CONFIG_INT340X_THERMAL)  += int340x_thermal/
 obj-$(CONFIG_ST_THERMAL)       += st/
+obj-$(CONFIG_TEGRA_SOCTHERM)   += tegra_soctherm.o