Merge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git into next

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

diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 4b03956b929c7dddb8079cd3d486ff7864fc1539..54e4ec9eb5df2be8fe0a1e1ccc2fbf908e70a7f1 100644 (file)
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -30,3 +30,4 @@ obj-$(CONFIG_DB8500_CPUFREQ_COOLING)  += db8500_cpufreq_cooling.o
 obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
 obj-$(CONFIG_X86_PKG_TEMP_THERMAL)     += x86_pkg_temp_thermal.o
 obj-$(CONFIG_TI_SOC_THERMAL)   += ti-soc-thermal/
+obj-$(CONFIG_ACPI_INT3403_THERMAL)     += int3403_thermal.o