diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:40:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:40:35 -0400 |
| commit | f0b364a13d7fba001c0571d954f165dfaf5f434a (patch) | |
| tree | 9cd8bf4e800295e5dbf279e63b9793223fd20577 /drivers | |
| parent | 5a73fdc5ea836d2edc5e02890b51185fe304d7d3 (diff) | |
| parent | bfeeb0f57940b143a55dcc7ee88e8842108d9145 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Make acpi-cpufreq unsticky again.
[CPUFREQ] longhaul: remove duplicated code.
[CPUFREQ] Longhaul - Disable arbiter CLE266
[CPUFREQ] Fix section mismatch warning
[CPUFREQ] Fix cut-n-paste bug in suspend printk
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index d35a9f06ab7b..2caaf71d80c8 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -994,7 +994,7 @@ static int cpufreq_suspend(struct sys_device * sysdev, pm_message_t pmsg) | |||
| 994 | unsigned int cur_freq = 0; | 994 | unsigned int cur_freq = 0; |
| 995 | struct cpufreq_policy *cpu_policy; | 995 | struct cpufreq_policy *cpu_policy; |
| 996 | 996 | ||
| 997 | dprintk("resuming cpu %u\n", cpu); | 997 | dprintk("suspending cpu %u\n", cpu); |
| 998 | 998 | ||
| 999 | if (!cpu_online(cpu)) | 999 | if (!cpu_online(cpu)) |
| 1000 | return 0; | 1000 | return 0; |