Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / arch / mips / txx9 / rbtx4927 / prom.c

diff --git a/arch/mips/txx9/rbtx4927/prom.c b/arch/mips/txx9/rbtx4927/prom.c
index 942e627..1dc0a5b 100644 (file)
--- a/arch/mips/txx9/rbtx4927/prom.c
+++ b/arch/mips/txx9/rbtx4927/prom.c
@@ -36,10 +36,7 @@
 
 void __init rbtx4927_prom_init(void)
 {
-       extern int tx4927_get_mem_size(void);
-       int msize;
-
        prom_init_cmdline();
-       msize = tx4927_get_mem_size();
-       add_memory_region(0, msize << 20, BOOT_MEM_RAM);
+       add_memory_region(0, tx4927_get_mem_size(), BOOT_MEM_RAM);
+       txx9_sio_putchar_init(TX4927_SIO_REG(0) & 0xfffffffffULL);
 }