summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds2006-12-18 04:08:11 +0100
committerLinus Torvalds2006-12-18 04:08:11 +0100
commite25db641c0e6dd49c5db24dbe154048d4a466727 (patch)
tree1e0cd6a728a405aa5b2e73e8d6d55dcb684416ea /drivers
parent[PATCH] more work_struct fixes: tas300x sound drivers (diff)
parent[CPUFREQ] longhaul compile fix. (diff)
downloadkernel-qcow2-linux-e25db641c0e6dd49c5db24dbe154048d4a466727.tar.gz
kernel-qcow2-linux-e25db641c0e6dd49c5db24dbe154048d4a466727.tar.xz
kernel-qcow2-linux-e25db641c0e6dd49c5db24dbe154048d4a466727.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] longhaul compile fix. [CPUFREQ] Advise not to use longhaul on VIA C7. [CPUFREQ] set policy->curfreq on initialization [CPUFREQ] Trivial cleanup for acpi read/write port in acpi-cpufreq.c [CPUFREQ] fixes typo in cpufreq.c
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/cpufreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 9fb2edf36611..d91330432ba2 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -959,7 +959,7 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq,
/**
- * cpufreq_quick_get - get the CPU frequency (in kHz) frpm policy->cur
+ * cpufreq_quick_get - get the CPU frequency (in kHz) from policy->cur
* @cpu: CPU number
*
* This is the last known freq, without actually getting it from the driver.