From b625dab5a0212365d8177df089e3d7ea7f31745f Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Wed, 14 Nov 2012 15:23:30 +0000 Subject: [PATCH] --- yaml --- r: 339287 b: refs/heads/master c: 4ba115b1e1ab6b717e08e0f4e766a1d16853d217 h: refs/heads/master i: 339285: 9625b059fcf073ab3fe8777f7fed24eae452b51c 339283: d2e1cfa841aeea4de96b7bd26177f8657eca4cf1 339279: ffbfb25731351d690f4be58e6a69d8e0a26317f1 v: v3 --- [refs] | 2 +- trunk/drivers/thermal/Kconfig | 2 +- trunk/include/linux/cpu_cooling.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4f963778f49e..6d72b13be01c 100644 --- 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 index d96da075c9f6..8636fae1f7ec 100644 --- 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 index b30cc79c7a82..40b4ef54cc7d 100644 --- 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