Merge Btrfs into fs/btrfs

[linux-2.6-omap-h63xx.git] / arch / mips / sibyte / sb1250 / prom.c

diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c
index 257c4e67435337e36f75daf7663603376381df58..65b1af66b6749748b73291306de16ceffbba27c0 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,7 +83,6 @@ void __init prom_init(void)
 
        strcpy(arcs_cmdline, "root=/dev/ram0 ");
 
-       mips_machgroup = MACH_GROUP_SIBYTE;
        prom_meminit();
 }