diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 17:42:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 17:42:14 -0700 |
| commit | 61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb (patch) | |
| tree | 2c6b7a4357ba85f7be027bd492da9bf8d7c6acb2 /arch/x86 | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 (diff) | |
| parent | [CPUFREQ] pcc-cpufreq: remove duplicate statements (diff) | |
| download | linux-dev-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.tar.xz linux-dev-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] pcc-cpufreq: remove duplicate statements
[CPUFREQ] Remove the pm_message_t argument from driver suspend
[CPUFREQ] Remove unneeded locks
[CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files
[CPUFREQ] Remove deprecated sysfs file sampling_rate_max
[CPUFREQ] powernow-k8: The table index is not worth displaying
[CPUFREQ] calculate delay after dbs_check_cpu
[CPUFREQ] Add documentation for sampling_down_factor
[CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c index 4a5a42b842ad..755a31e0f5b0 100644 --- a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c @@ -315,8 +315,6 @@ static int __init pcc_cpufreq_do_osc(acpi_handle *handle) input.count = 4; input.pointer = in_params; - input.count = 4; - input.pointer = in_params; in_params[0].type = ACPI_TYPE_BUFFER; in_params[0].buffer.length = 16; in_params[0].buffer.pointer = OSC_UUID; diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index c567dec854f6..1ae4133e6bd6 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c @@ -630,8 +630,7 @@ static void print_basics(struct powernow_k8_data *data) data->powernow_table[j].frequency/1000); } else { printk(KERN_INFO PFX - " %d : fid 0x%x (%d MHz), vid 0x%x\n", - j, + "fid 0x%x (%d MHz), vid 0x%x\n", data->powernow_table[j].index & 0xff, data->powernow_table[j].frequency/1000, data->powernow_table[j].index >> 8); |