diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-28 10:46:15 (GMT) |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-31 20:35:28 (GMT) |
| commit | 348c913f571dc1a0e7fd84d7206fc7ee983420df (patch) | |
| tree | d08ae116332863b459bafffdf799c619c2c18a7c /arch/mips/lemote/lm2e/setup.c | |
| parent | 3266c6a988a2d18ffe91fe7fd56d0d6cc13c341e (diff) | |
| download | linux-fsl-qoriq-348c913f571dc1a0e7fd84d7206fc7ee983420df.tar.xz | |
[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/lemote/lm2e/setup.c')
| -rw-r--r-- | arch/mips/lemote/lm2e/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c index 0e4d1fa..dbb8016 100644 --- a/arch/mips/lemote/lm2e/setup.c +++ b/arch/mips/lemote/lm2e/setup.c @@ -58,7 +58,7 @@ extern void mips_reboot_setup(void); #define PTR_PAD(p) (p) #endif -unsigned long cpu_clock; +unsigned long cpu_clock_freq; unsigned long bus_clock; unsigned int memsize; unsigned int highmemsize = 0; @@ -71,7 +71,7 @@ void __init plat_timer_setup(struct irqaction *irq) static void __init loongson2e_time_init(void) { /* setup mips r4k timer */ - mips_hpt_frequency = cpu_clock / 2; + mips_hpt_frequency = cpu_clock_freq / 2; } static unsigned long __init mips_rtc_get_time(void) |