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/setup.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/setup.c')
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c index f7f93ae24c34..58862c8d1d00 100644 --- a/arch/mips/pmc-sierra/yosemite/setup.c +++ b/arch/mips/pmc-sierra/yosemite/setup.c | |||
@@ -59,7 +59,7 @@ unsigned char titan_ge_mac_addr_base[6] = { | |||
59 | 0x00, 0xe0, 0x04, 0x00, 0x00, 0x21 | 59 | 0x00, 0xe0, 0x04, 0x00, 0x00, 0x21 |
60 | }; | 60 | }; |
61 | 61 | ||
62 | unsigned long cpu_clock; | 62 | unsigned long cpu_clock_freq; |
63 | unsigned long yosemite_base; | 63 | unsigned long yosemite_base; |
64 | 64 | ||
65 | static struct m48t37_rtc *m48t37_base; | 65 | static struct m48t37_rtc *m48t37_base; |
@@ -140,7 +140,7 @@ void __init plat_timer_setup(struct irqaction *irq) | |||
140 | 140 | ||
141 | void yosemite_time_init(void) | 141 | void yosemite_time_init(void) |
142 | { | 142 | { |
143 | mips_hpt_frequency = cpu_clock / 2; | 143 | mips_hpt_frequency = cpu_clock_freq / 2; |
144 | mips_hpt_frequency = 33000000 * 3 * 5; | 144 | mips_hpt_frequency = 33000000 * 3 * 5; |
145 | } | 145 | } |
146 | 146 | ||