diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 20:50:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 20:50:22 -0400 |
| commit | 2ee8099f2c2bc74a7c2fac7f83e12a5d651681d3 (patch) | |
| tree | 433ebb87a3d5d02e7df3700c846ac9af632c55f3 /drivers/cpufreq/cpufreq.c | |
| parent | c03efdb202a4882f426ce49766859af4058c9b8a (diff) | |
| parent | 24669f7d00d387799fc6a39452ab22d7f078f043 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] sw_any_bug_dmi_table can be used on resume, so it isn't initdata
[CPUFREQ] Fix some more CPU hotplug locking.
[CPUFREQ] Workaround for BIOS bug in software coordination of frequency
[CPUFREQ] Longhaul - Add voltage scaling to driver
[CPUFREQ] Fix sparse warning in ondemand
[CPUFREQ] make drivers/cpufreq/cpufreq_ondemand.c:powersave_bias_target() static
[CPUFREQ] Longhaul - Add ignore_latency option
[CPUFREQ] Longhaul - Disable arbiter
[CPUFREQ][2/2] ondemand: updated add powersave_bias tunable
[CPUFREQ][1/2] ondemand: updated tune for hardware coordination
[CPUFREQ] Fix typo.
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 b3df613ae4ec..d35a9f06ab7b 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, "cpufreq-core", msg) | 32 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, "cpufreq-core", msg) |
| 33 | 33 | ||
| 34 | /** | 34 | /** |
| 35 | * The "cpufreq driver" - the arch- or hardware-dependend low | 35 | * The "cpufreq driver" - the arch- or hardware-dependent low |
| 36 | * level driver of CPUFreq support, and its spinlock. This lock | 36 | * level driver of CPUFreq support, and its spinlock. This lock |
| 37 | * also protects the cpufreq_cpu_data array. | 37 | * also protects the cpufreq_cpu_data array. |
| 38 | */ | 38 | */ |