1 files changed, 1 insertions, 39 deletions

diff --git a/arch/m68k/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c
index c32f76791f48..386df3b68cdf 100644
--- a/arch/m68k/coldfire/m54xx.c
+++ b/arch/m68k/coldfire/m54xx.c
@@ -25,7 +25,6 @@
 #include <asm/m54xxgpt.h>
 #ifdef CONFIG_MMU
 #include <asm/mmu_context.h>
-#include <linux/pfn.h>
 #endif
 
 /***************************************************************************/
@@ -78,47 +77,10 @@ static void mcf54xx_reset(void)
 
 /***************************************************************************/
 
-#ifdef CONFIG_MMU
-
-unsigned long num_pages;
-
-static void __init mcf54xx_bootmem_alloc(void)
-{
-        unsigned long start_pfn;
-        unsigned long memstart;
-
-        /* _rambase and _ramend will be naturally page aligned */
-        m68k_memory[0].addr = _rambase;
-        m68k_memory[0].size = _ramend - _rambase;
-
-        /* compute total pages in system */
-        num_pages = PFN_DOWN(_ramend - _rambase);
-
-        /* page numbers */
-        memstart = PAGE_ALIGN(_ramstart);
-        min_low_pfn = PFN_DOWN(_rambase);
-        start_pfn = PFN_DOWN(memstart);
-        max_pfn = max_low_pfn = PFN_DOWN(_ramend);
-        high_memory = (void *)_ramend;
-
-        m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;
-        module_fixup(NULL, __start_fixup, __stop_fixup);
-
-        /* setup bootmem data */
-        m68k_setup_node(0);
-        memstart += init_bootmem_node(NODE_DATA(0), start_pfn,
-                min_low_pfn, max_low_pfn);
-        free_bootmem_node(NODE_DATA(0), memstart, _ramend - memstart);
-}
-
-#endif /* CONFIG_MMU */
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
 #ifdef CONFIG_MMU
-        mcf54xx_bootmem_alloc();
+        cf_bootmem_alloc();
         mmu_context_init();
 #endif
         mach_reset = mcf54xx_reset;