diff options
| author | Linus Torvalds | 2006-10-01 00:40:35 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-01 00:40:35 -0700 |
| 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) unsigned int cur_freq = 0; struct cpufreq_policy *cpu_policy; - dprintk("resuming cpu %u\n", cpu); + dprintk("suspending cpu %u\n", cpu); if (!cpu_online(cpu)) return 0; |