Merge branch 'sfc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc

[firefly-linux-kernel-4.4.55.git] / arch / mips / mti-sead3 / sead3-init.c

diff --git a/arch/mips/mti-sead3/sead3-init.c b/arch/mips/mti-sead3/sead3-init.c
index a958cad6fff65a3408dedb0d834d70386e9c0a21..f95abaa1aa5db6a06b4d8b80696c99120ed48711 100644 (file)
--- a/arch/mips/mti-sead3/sead3-init.c
+++ b/arch/mips/mti-sead3/sead3-init.c
@@ -77,7 +77,6 @@ void __init prom_init(void)
        board_ejtag_handler_setup = mips_ejtag_setup;
 
        prom_init_cmdline();
-       prom_meminit();
 #ifdef CONFIG_EARLY_PRINTK
        if ((strstr(prom_getcmdline(), "console=ttyS0")) != NULL)
                prom_init_early_console(0);
@@ -89,3 +88,7 @@ void __init prom_init(void)
                strcat(prom_getcmdline(), " console=ttyS0,38400n8r");
 #endif
 }
+
+void prom_free_prom_memory(void)
+{
+}