diff --git a/[refs] b/[refs] index 579e101a20e3..007ef21b942d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 137d0795a72786fa33e6900cb2ac2eae81f4b6ee +refs/heads/master: e786c6ad2ba7f1f9b9cc9d75d5e7ba7d9cdc550a diff --git a/trunk/arch/microblaze/mm/init.c b/trunk/arch/microblaze/mm/init.c index 6eea5544ad8b..aa6e163411b5 100644 --- a/trunk/arch/microblaze/mm/init.c +++ b/trunk/arch/microblaze/mm/init.c @@ -193,12 +193,6 @@ void free_initmem(void) (unsigned long)(&__init_end)); } -/* FIXME from arch/powerpc/mm/mem.c*/ -void show_mem(void) -{ - printk(KERN_NOTICE "%s\n", __func__); -} - void __init mem_init(void) { high_memory = (void *)__va(memory_end);