commit 348c913f571dc1a0e7fd84d7206fc7ee983420df
author Ralf Baechle <ralf@linux-mips.org> Sat Jul 28 11:46:15 2007 +0100
committer Ralf Baechle <ralf@linux-mips.org> Tue Jul 31 21:35:28 2007 +0100
tree d08ae116332863b459bafffdf799c619c2c18a7c
parent 3266c6a988a2d18ffe91fe7fd56d0d6cc13c341e

[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>

arch/mips/pmc-sierra/yosemite/prom.c

diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index 1e1685e..0cd78f0f 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -34,7 +34,7 @@
 struct callvectors *debug_vectors;
 
 extern unsigned long yosemite_base;
-extern unsigned long cpu_clock;
+extern unsigned long cpu_clock_freq;
 
 const char *get_system_type(void)
 {
@@ -119,7 +119,7 @@
 					  16);
 
 		if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0)
-			cpu_clock =
+			cpu_clock_freq =
 			    simple_strtol(*env + strlen("cpuclock="), NULL,
 					  10);