diff options
| author |   Zhang Rui <rui.zhang@intel.com> | 2014-12-09 11:37:35 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 11:37:35 +0800 |
| commit | 9c1e4550b5cbe17ff68ce631356190ef9a565386 (patch) | |
| tree | 04cd872bd8afd2b2fe143e2c17a180a39d1a275c /drivers/thermal/Makefile | |
| parent | Linux 3.18-rc7 (diff) | |
| parent | thermal: of: Extend current of-thermal.c code to allow setting emulated temp (diff) | |
| download | linux-dev-9c1e4550b5cbe17ff68ce631356190ef9a565386.tar.xz linux-dev-9c1e4550b5cbe17ff68ce631356190ef9a565386.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into eduardo-soc-thermal
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 39c4fe87da2f..fa0dc486790f 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 |