Thermal: build cpu_cooling code into thermal_sys module

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Durgadoss R <durgadoss.r@intel.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index fb0672baff40..d1c2160492aa 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -67,7 +67,7 @@ config THERMAL_GOV_USER_SPACE
           Enable this to let the user space manage the platform thermals.
 
 config CPU_THERMAL
-        tristate "generic cpu cooling support"
+        bool "generic cpu cooling support"
         depends on CPU_FREQ
         select CPU_FREQ_TABLE
         help
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index b17bfb055498..c054d410ac3f 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -11,7 +11,7 @@ thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE)	+= step_wise.o
 thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE)    += user_space.o
 
 # cpufreq cooling
-obj-$(CONFIG_CPU_THERMAL)       += cpu_cooling.o
+thermal_sys-$(CONFIG_CPU_THERMAL)       += cpu_cooling.o
 
 # platform thermal drivers
 obj-$(CONFIG_SPEAR_THERMAL)     += spear_thermal.o
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h
index bc479b1e0fd9..77c87c9d0193 100644
--- a/include/linux/cpu_cooling.h
+++ b/include/linux/cpu_cooling.h
@@ -29,7 +29,7 @@
 #define CPUFREQ_COOLING_START           0
 #define CPUFREQ_COOLING_STOP            1
 
-#if defined(CONFIG_CPU_THERMAL) || defined(CONFIG_CPU_THERMAL_MODULE)
+#ifdef CONFIG_CPU_THERMAL
 /**
  * cpufreq_cooling_register - function to create cpufreq cooling device.
  * @clip_cpus: cpumask of cpus where the frequency constraints will happen