---

yaml --- r: 339287 b: refs/heads/master c: 4ba115b h: refs/heads/master i: 339285: 9625b05 339283: d2e1cfa 339279: ffbfb25 v: v3
git-mirror · Nov 22, 2012 · b625dab · b625dab
1 parent c9822dd
commit b625dab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3778ff5c709899a29cefe4b3077a926d0e1e9785
+refs/heads/master: 4ba115b1e1ab6b717e08e0f4e766a1d16853d217
diff --git a/trunk/drivers/thermal/Kconfig b/trunk/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/trunk/include/linux/cpu_cooling.h b/trunk/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