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

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

diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c
index 134fcc2..d73123c 100644 (file)
--- a/arch/mips/txx9/rbtx4938/prom.c
+++ b/arch/mips/txx9/rbtx4938/prom.c
@@ -11,62 +11,16 @@
  */
 
 #include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
 #include <linux/bootmem.h>
-
-#include <asm/addrspace.h>
 #include <asm/bootinfo.h>
-#include <asm/txx9/tx4938.h>
-
-void __init prom_init_cmdline(void)
-{
-       int argc = (int) fw_arg0;
-       char **argv = (char **) fw_arg1;
-       int i;
-
-       /* ignore all built-in args if any f/w args given */
-       if (argc > 1) {
-               *arcs_cmdline = '\0';
-       }
-
-       for (i = 1; i < argc; i++) {
-               if (i != 1) {
-                       strcat(arcs_cmdline, " ");
-               }
-               strcat(arcs_cmdline, argv[i]);
-       }
-}
+#include <asm/txx9/generic.h>
+#include <asm/txx9/rbtx4938.h>
 
-void __init prom_init(void)
+void __init rbtx4938_prom_init(void)
 {
-       extern int tx4938_get_mem_size(void);
-       int msize;
 #ifndef CONFIG_TX4938_NAND_BOOT
        prom_init_cmdline();
 #endif
-
-       msize = tx4938_get_mem_size();
-       add_memory_region(0, msize << 20, BOOT_MEM_RAM);
-
-       return;
-}
-
-void __init prom_free_prom_memory(void)
-{
-}
-
-void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
-{
-       return;
-}
-
-const char *get_system_type(void)
-{
-       return "Toshiba RBTX4938";
-}
-
-char * __init prom_getcmdline(void)
-{
-       return &(arcs_cmdline[0]);
+       add_memory_region(0, tx4938_get_mem_size(), BOOT_MEM_RAM);
+       txx9_sio_putchar_init(TX4938_SIO_REG(0) & 0xfffffffffULL);
 }