Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-omap-h63xx.git] / arch / mips / sgi-ip32 / ip32-memory.c

diff --git a/arch/mips/sgi-ip32/ip32-memory.c b/arch/mips/sgi-ip32/ip32-memory.c
index fc76ca92bab9e07316be96698703c78aa34a6e52..ca93ecf825ae73b84e1d1a2bb0f38dcd70962c3e 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-memory.c
+++ b/arch/mips/sgi-ip32/ip32-memory.c
@@ -19,7 +19,7 @@
 
 extern void crime_init(void);
 
-void __init prom_meminit (void)
+void __init prom_meminit(void)
 {
        u64 base, size;
        int bank;
@@ -36,14 +36,13 @@ void __init prom_meminit (void)
                if (base + size > (256 << 20))
                        base += CRIME_HI_MEM_BASE;
 
-               printk("CRIME MC: bank %u base 0x%016lx size %luMB\n",
-                       bank, base, size);
-               add_memory_region (base, size, BOOT_MEM_RAM);
+               printk("CRIME MC: bank %u base 0x%016lx size %luMiB\n",
+                       bank, base, size >> 20);
+               add_memory_region(base, size, BOOT_MEM_RAM);
        }
 }
 
 
-unsigned long __init prom_free_prom_memory (void)
+void __init prom_free_prom_memory(void)
 {
-       return 0;
 }