diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-02-18 03:13:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-02-18 03:13:32 -0800 |
| commit | f7d6fe842e69a9697df83029976d15216edefccb (patch) | |
| tree | e3ee6f4c0204c260dce2623c3189c430421a3cc0 | |
| parent | f5106b15009a335c36d590c98862079f8d1f78d9 (diff) | |
| parent | 4859cfbbda7de3a663c865ca5ec208f3fdcacda2 (diff) | |
Merge bk://linux-dj.bkbits.net/cpufreq
into ppc970.osdl.org:/home/torvalds/v2.5/linux
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/longhaul.c | 6 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/longrun.c | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 928a12b1905f..1ccb1e946719 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -521,7 +521,7 @@ CPU FREQUENCY DRIVERS P: Dave Jones M: davej@codemonkey.org.uk L: cpufreq@www.linux.org.uk -W: http://www.codemonkey.org.uk/cpufreq/ +W: http://www.codemonkey.org.uk/projects/cpufreq/ S: Maintained CPUID/MSR DRIVER diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c index 6fb05b3269fb..56d2df1c66a7 100644 --- a/arch/i386/kernel/cpu/cpufreq/longhaul.c +++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c @@ -1,5 +1,5 @@ /* - * (C) 2001-2003 Dave Jones. <davej@codemonkey.org.uk> + * (C) 2001-2004 Dave Jones. <davej@codemonkey.org.uk> * (C) 2002 Padraig Brady. <padraig@antefacto.com> * * Licensed under the terms of the GNU GPL License version 2. @@ -186,6 +186,7 @@ static int _guess (int guess, int maxmult) return target; } + static int guess_fsb(int maxmult) { int speed = (cpu_khz/1000); @@ -203,7 +204,6 @@ static int guess_fsb(int maxmult) } - static int __init longhaul_get_ranges (void) { struct cpuinfo_x86 *c = cpu_data; @@ -359,7 +359,7 @@ static int longhaul_target (struct cpufreq_policy *policy, return 0; } -static int longhaul_cpu_init (struct cpufreq_policy *policy) +static int __init longhaul_cpu_init (struct cpufreq_policy *policy) { struct cpuinfo_x86 *c = cpu_data; char *cpuname=NULL; diff --git a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/i386/kernel/cpu/cpufreq/longrun.c index 8633cf069d07..73a6b7eac052 100644 --- a/arch/i386/kernel/cpu/cpufreq/longrun.c +++ b/arch/i386/kernel/cpu/cpufreq/longrun.c @@ -220,7 +220,7 @@ static unsigned int __init longrun_determine_freqs(unsigned int *low_freq, } -static int longrun_cpu_init(struct cpufreq_policy *policy) +static int __init longrun_cpu_init(struct cpufreq_policy *policy) { int result = 0; diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c index 30e4666ddcfb..db830db703fb 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c @@ -1,7 +1,7 @@ /* * AMD K7 Powernow driver. * (C) 2003 Dave Jones <davej@codemonkey.org.uk> on behalf of SuSE Labs. - * (C) 2003 Dave Jones <davej@redhat.com> + * (C) 2003-2004 Dave Jones <davej@redhat.com> * * Licensed under the terms of the GNU GPL License version 2. * Based upon datasheets & sample CPUs kindly provided by AMD. |