summaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi-ip32/ip32-memory.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-30 21:00:04 +0000
committerAnton Altaparmakov <aia21@cantab.net>2005-10-30 21:00:04 +0000
commit07b188ab773e183871e57b33ae37bf635c9f12ba (patch)
tree311df8a0dd12fb7bd3e9b5b1a5ca500f0428d679 /arch/mips/sgi-ip32/ip32-memory.c
parent47c564e10f219f867bdb49225972749a43485a47 (diff)
parent9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (diff)
downloadblackbird-op-linux-07b188ab773e183871e57b33ae37bf635c9f12ba.tar.gz
blackbird-op-linux-07b188ab773e183871e57b33ae37bf635c9f12ba.zip
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/mips/sgi-ip32/ip32-memory.c')
-rw-r--r--arch/mips/sgi-ip32/ip32-memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip32/ip32-memory.c b/arch/mips/sgi-ip32/ip32-memory.c
index fc76ca92bab9..d37d40a3cdae 100644
--- a/arch/mips/sgi-ip32/ip32-memory.c
+++ b/arch/mips/sgi-ip32/ip32-memory.c
@@ -36,8 +36,8 @@ 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);
+ printk("CRIME MC: bank %u base 0x%016lx size %luMiB\n",
+ bank, base, size >> 20);
add_memory_region (base, size, BOOT_MEM_RAM);
}
}
OpenPOWER on IntegriCloud