From: Zhang Rui Date: Tue, 27 Sep 2016 06:03:19 +0000 (+0800) Subject: Merge branches 'thermal-soc', 'thermal-core', 'thermal-intel' and 'thermal-tegra... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=040a3eadf00b4993fb215fba1d788c91712401ba;p=linux-beck.git Merge branches 'thermal-soc', 'thermal-core', 'thermal-intel' and 'thermal-tegra-hw-throttle' into next --- 040a3eadf00b4993fb215fba1d788c91712401ba diff --cc drivers/thermal/Makefile index 7c1aca6d8b14,10b07c14f8a9,7aa7f4c2e3da,10b07c14f8a9..c92eb22a41ff --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@@@@ -47,9 -45,8 -45,9 -45,8 +47,10 @@@@@ obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += obj-$(CONFIG_INTEL_QUARK_DTS_THERMAL) += intel_quark_dts_thermal.o obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/ obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/ ++ +obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o obj-$(CONFIG_ST_THERMAL) += st/ +++obj-$(CONFIG_QCOM_TSENS) += qcom/ obj-$(CONFIG_TEGRA_SOCTHERM) += tegra/ obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o