diff options
| author | Eugen Mandrenko <ievgen.mandrenko@ti.com> | 2012-04-19 16:17:15 +0300 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 12:59:41 +0200 |
| commit | ee0f19a3a455cd73c98e137ca421a1ce58c3bf4b (patch) | |
| tree | a74d5be1cc18ffbb195155fa5e9b64c2196e97d1 /arch/arm/mach-omap2/omap2plus-cpufreq.c | |
| parent | f4a029ae88373098cfcda9f267da8724d6e7d955 (diff) | |
| download | kernel_samsung_tuna-ee0f19a3a455cd73c98e137ca421a1ce58c3bf4b.zip kernel_samsung_tuna-ee0f19a3a455cd73c98e137ca421a1ce58c3bf4b.tar.gz kernel_samsung_tuna-ee0f19a3a455cd73c98e137ca421a1ce58c3bf4b.tar.bz2 | |
TI TFW:fix for THERMAL_FRAMEWORK disable cause build error
Patch rebuilds Makefiles tree for thermal_framework
Change-Id: Id47b907d83b3231e7c7bb455e2175df3c9d8c9d3
Signed-off-by: Eugen Mandrenko <ievgen.mandrenko@ti.com>
Conflicts:
arch/arm/configs/blaze_defconfig
arch/arm/mach-omap2/board-4430sdp.c
Diffstat (limited to 'arch/arm/mach-omap2/omap2plus-cpufreq.c')
| -rwxr-xr-x | arch/arm/mach-omap2/omap2plus-cpufreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c index 1a34478..7a610b9 100755 --- a/arch/arm/mach-omap2/omap2plus-cpufreq.c +++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c @@ -334,7 +334,7 @@ static inline void freq_table_free(void) opp_free_cpufreq_table(mpu_dev, &freq_table); } -#if defined(CONFIG_THERMAL_FRAMEWORK) || defined(CONFIG_OMAP4_DUTY_CYCLE) +#if defined(CONFIG_OMAP_THERMAL) || defined(CONFIG_OMAP4_DUTY_CYCLE) void omap_thermal_step_freq_down(void) { unsigned int cur; @@ -438,7 +438,7 @@ static void __exit omap_duty_cooling_exit(void) { } #endif -#ifdef CONFIG_THERMAL_FRAMEWORK +#ifdef CONFIG_OMAP_THERMAL static struct thermal_dev_ops cpufreq_cooling_ops = { .cool_device = cpufreq_apply_cooling, |