Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[pandora-kernel.git] / arch / mips / sibyte / sb1250 / prom.c

diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c
index 3c33a45..65b1af6 100644 (file)
--- a/arch/mips/sibyte/sb1250/prom.c
+++ b/arch/mips/sibyte/sb1250/prom.c
@@ -66,7 +66,7 @@ static void prom_linux_exit(void)
 {
 #ifdef CONFIG_SMP
        if (smp_processor_id()) {
-               smp_call_function(prom_cpu0_exit,NULL,1,1);
+               smp_call_function(prom_cpu0_exit, NULL, 1);
        }
 #endif
        while(1);
@@ -83,14 +83,12 @@ void __init prom_init(void)
 
        strcpy(arcs_cmdline, "root=/dev/ram0 ");
 
-       mips_machgroup = MACH_GROUP_SIBYTE;
        prom_meminit();
 }
 
-unsigned long __init prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
 {
        /* Not sure what I'm supposed to do here.  Nothing, I think */
-       return 0;
 }
 
 void prom_putchar(char c)