diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
| commit | 9774f3384125912eb491ca77f77907324db3ed05 (patch) | |
| tree | 0bdc7486e911dd9e955b41283ee19ac74521f7bd /drivers/cpufreq/cpufreq.c | |
| parent | 3be11c8f4f2fa194834c2e83540f34da442b8977 (diff) | |
| parent | f238085415c56618e042252894f2fcc971add645 (diff) | |
merge linus into test branch
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
| -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. |