diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 11:38:34 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 11:38:34 +0800 |
| commit | c89d99546dc5b076ccd6692c48ada9a92820a4ac (patch) | |
| tree | 30788930f8c3fca80c0e5d8a377786d4a4a863bd /drivers/thermal/Makefile | |
| parent | 5a530ff0d88a366736ae4d1021e7358b52e55756 (diff) | |
| parent | 9c1e4550b5cbe17ff68ce631356190ef9a565386 (diff) | |
| download | op-kernel-dev-c89d99546dc5b076ccd6692c48ada9a92820a4ac.zip op-kernel-dev-c89d99546dc5b076ccd6692c48ada9a92820a4ac.tar.gz | |
Merge branch 'eduardo-soc-thermal' into thermal-soc
Diffstat (limited to 'drivers/thermal/Makefile')
| -rw-r--r-- | drivers/thermal/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 39c4fe8..fa0dc48 100644 --- 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 |
