diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-17 22:08:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-17 22:08:11 -0500 |
| commit | e25db641c0e6dd49c5db24dbe154048d4a466727 (patch) | |
| tree | 1e0cd6a728a405aa5b2e73e8d6d55dcb684416ea /drivers | |
| parent | 7686fcf7304eebd2228ec47045cb28ee3c58b1f1 (diff) | |
| parent | 928ee513c2fc39799cb13302bc02344a849fa37c (diff) | |
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.c | 2 |
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, | |||
| 959 | 959 | ||
| 960 | 960 | ||
| 961 | /** | 961 | /** |
| 962 | * cpufreq_quick_get - get the CPU frequency (in kHz) frpm policy->cur | 962 | * cpufreq_quick_get - get the CPU frequency (in kHz) from policy->cur |
| 963 | * @cpu: CPU number | 963 | * @cpu: CPU number |
| 964 | * | 964 | * |
| 965 | * This is the last known freq, without actually getting it from the driver. | 965 | * This is the last known freq, without actually getting it from the driver. |