diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /arch/x86/kernel/cpu/cpufreq/powernow-k7.c | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/powernow-k7.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c index d47c775eb0ab..9a97116f89e5 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c | |||
| @@ -714,14 +714,17 @@ static struct freq_attr *powernow_table_attr[] = { | |||
| 714 | }; | 714 | }; |
| 715 | 715 | ||
| 716 | static struct cpufreq_driver powernow_driver = { | 716 | static struct cpufreq_driver powernow_driver = { |
| 717 | .verify = powernow_verify, | 717 | .verify = powernow_verify, |
| 718 | .target = powernow_target, | 718 | .target = powernow_target, |
| 719 | .get = powernow_get, | 719 | .get = powernow_get, |
| 720 | .init = powernow_cpu_init, | 720 | #ifdef CONFIG_X86_POWERNOW_K7_ACPI |
| 721 | .exit = powernow_cpu_exit, | 721 | .bios_limit = acpi_processor_get_bios_limit, |
| 722 | .name = "powernow-k7", | 722 | #endif |
| 723 | .owner = THIS_MODULE, | 723 | .init = powernow_cpu_init, |
| 724 | .attr = powernow_table_attr, | 724 | .exit = powernow_cpu_exit, |
| 725 | .name = "powernow-k7", | ||
| 726 | .owner = THIS_MODULE, | ||
| 727 | .attr = powernow_table_attr, | ||
| 725 | }; | 728 | }; |
| 726 | 729 | ||
| 727 | static int __init powernow_init(void) | 730 | static int __init powernow_init(void) |