diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-28 06:46:15 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-31 16:35:28 -0400 |
commit | 348c913f571dc1a0e7fd84d7206fc7ee983420df (patch) | |
tree | d08ae116332863b459bafffdf799c619c2c18a7c /arch/mips/pmc-sierra/yosemite/prom.c | |
parent | 3266c6a988a2d18ffe91fe7fd56d0d6cc13c341e (diff) |
[MIPS] Fix build breakage due to duplicate cpu_clock definition
commit e436d80085133858bf2613a630365e8a0459fd58
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 19 21:28:35 2007 +0200
[PATCH] sched: implement cpu_clock(cpu) high-speed time source
broke the build of several MIPS platforms which were already using the
symbol cpu_clock for the own purposes.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pmc-sierra/yosemite/prom.c')
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/prom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c index 1e1685e415a4..0cd78f0f5f2d 100644 --- a/arch/mips/pmc-sierra/yosemite/prom.c +++ b/arch/mips/pmc-sierra/yosemite/prom.c | |||
@@ -34,7 +34,7 @@ extern void prom_grab_secondary(void); | |||
34 | struct callvectors *debug_vectors; | 34 | struct callvectors *debug_vectors; |
35 | 35 | ||
36 | extern unsigned long yosemite_base; | 36 | extern unsigned long yosemite_base; |
37 | extern unsigned long cpu_clock; | 37 | extern unsigned long cpu_clock_freq; |
38 | 38 | ||
39 | const char *get_system_type(void) | 39 | const char *get_system_type(void) |
40 | { | 40 | { |
@@ -119,7 +119,7 @@ void __init prom_init(void) | |||
119 | 16); | 119 | 16); |
120 | 120 | ||
121 | if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) | 121 | if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) |
122 | cpu_clock = | 122 | cpu_clock_freq = |
123 | simple_strtol(*env + strlen("cpuclock="), NULL, | 123 | simple_strtol(*env + strlen("cpuclock="), NULL, |
124 | 10); | 124 | 10); |
125 | 125 | ||