Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[sfrench/cifs-2.6.git] / 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 9fe4973377c315ad0dd829946c4521e8d7a1c3ac..9b9936de65894a7dff5c65a14614d775205a673e 100644 (file)
--- 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);
 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,22 +119,20 @@ void __init prom_init(void)
                                          16);
 
                if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0)
-                       cpu_clock =
+                       cpu_clock_freq =
                            simple_strtol(*env + strlen("cpuclock="), NULL,
                                          10);
 
                env++;
        }
 
-       mips_machgroup = MACH_GROUP_TITAN;
        mips_machtype = MACH_TITAN_YOSEMITE;
 
        prom_grab_secondary();
 }
 
-unsigned long __init prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
 {
-       return 0;
 }
 
 void __init prom_fixup_mem_map(unsigned long start, unsigned long end)