summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/Makefile
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-06-18 06:31:26 +0800
committerZhang Rui <rui.zhang@intel.com>2013-06-18 06:31:26 +0800
commitf157f5964bdc604d8cbf0b71780a0d47ea9f7371 (patch)
tree8667f1068b026c640cae1a6cb229ca4944c8c3c7 /drivers/thermal/Makefile
parent30072fb91e1447b00fa148500c49010265b530c6 (diff)
parent23be63f48d928cd5a21db58f73c731357e895250 (diff)
downloadlinux-f157f5964bdc604d8cbf0b71780a0d47ea9f7371.tar.gz
linux-f157f5964bdc604d8cbf0b71780a0d47ea9f7371.tar.bz2
linux-f157f5964bdc604d8cbf0b71780a0d47ea9f7371.zip
Merge branch 'cpu-package-thermal' of .git into next
Conflicts: drivers/thermal/Kconfig drivers/thermal/Makefile
Diffstat (limited to 'drivers/thermal/Makefile')
-rw-r--r--drivers/thermal/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 85693941fda0..67184a293e3f 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -23,4 +23,5 @@ obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
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/