2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index d96da075c9f6..8636fae1f7ec 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -67,7 +67,7 @@ config USER_SPACE
           Enable this to let the user space manage the platform thermals.
 
 config CPU_THERMAL
-        bool "generic cpu cooling support"
+        tristate "generic cpu cooling support"
         depends on CPU_FREQ
         select CPU_FREQ_TABLE
         help
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h
index b30cc79c7a82..40b4ef54cc7d 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
 
-#ifdef CONFIG_CPU_THERMAL
+#if defined(CONFIG_CPU_THERMAL) || defined(CONFIG_CPU_THERMAL_MODULE)
 /**
  * cpufreq_cooling_register - function to create cpufreq cooling device.
  * @clip_cpus: cpumask of cpus where the frequency constraints will happen