diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
| commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
| tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /drivers/acpi/processor_thermal.c | |
| parent | df127ee375af4cb40b979605e0c336fc79bd38e7 (diff) | |
| parent | 2d200665c37f544f648d77a05a06ab63328f0d3a (diff) | |
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'drivers/acpi/processor_thermal.c')
| -rw-r--r-- | drivers/acpi/processor_thermal.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index fde49b9b1d99..79cb65332894 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c | |||
| @@ -156,15 +156,6 @@ static int cpufreq_set_cur_state(unsigned int cpu, int state) | |||
| 156 | return 0; | 156 | return 0; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | static int acpi_thermal_cpufreq_increase(unsigned int cpu) | ||
| 160 | { | ||
| 161 | return -ENODEV; | ||
| 162 | } | ||
| 163 | static int acpi_thermal_cpufreq_decrease(unsigned int cpu) | ||
| 164 | { | ||
| 165 | return -ENODEV; | ||
| 166 | } | ||
| 167 | |||
| 168 | #endif | 159 | #endif |
| 169 | 160 | ||
| 170 | int acpi_processor_get_limit_info(struct acpi_processor *pr) | 161 | int acpi_processor_get_limit_info(struct acpi_processor *pr) |