diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 14:30:58 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 14:30:58 +0800 |
| commit | 6ceaf58abe25e86292152005c51169796bad3407 (patch) | |
| tree | e97a032bc9dc63da9939136bd32ed5e0ad0f09bc /drivers/thermal/Makefile | |
| parent | 9ceaa81efd1dd5ec83cf6be5a9445809583a03b6 (diff) | |
| parent | d8054749c6795073cb427465a726213d45898f68 (diff) | |
| download | linux-6ceaf58abe25e86292152005c51169796bad3407.tar.bz2 | |
Merge branch 'int340x-thermal' of .git into next
Diffstat (limited to 'drivers/thermal/Makefile')
| -rw-r--r-- | drivers/thermal/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index b7e65423d7b6..39c4fe87da2f 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -32,5 +32,5 @@ obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/ -obj-$(CONFIG_ACPI_INT3403_THERMAL) += int3403_thermal.o +obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/ obj-$(CONFIG_ST_THERMAL) += st/ |