diff --git a/[refs] b/[refs]
index 3508ee08a890..c6e56ccc681a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25b48ff852e2e71b0d44d8ee6f69c9b704bd5070
+refs/heads/master: d5981a5f16ed8d648b7f44e4aa19cd25733518a3
diff --git a/trunk/arch/c6x/include/asm/memblock.h b/trunk/arch/c6x/include/asm/memblock.h
deleted file mode 100644
index 1181a979a823..000000000000
--- a/trunk/arch/c6x/include/asm/memblock.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_C6X_MEMBLOCK_H
-#define _ASM_C6X_MEMBLOCK_H
-
-#endif /* _ASM_C6X_MEMBLOCK_H */
diff --git a/trunk/arch/c6x/kernel/setup.c b/trunk/arch/c6x/kernel/setup.c
index 3c2858f0d91e..c126f0414be5 100644
--- a/trunk/arch/c6x/kernel/setup.c
+++ b/trunk/arch/c6x/kernel/setup.c
@@ -305,8 +305,6 @@ void __init setup_arch(char **cmdline_p)
 	/* Initialize command line */
 	*cmdline_p = c6x_command_line;
 
-	memblock_init();
-
 	memory_end = ram_end;
 	memory_end &= ~(PAGE_SIZE - 1);
 
@@ -366,7 +364,6 @@ void __init setup_arch(char **cmdline_p)
 					 memory_end >> PAGE_SHIFT);
 	memblock_reserve(memory_start, bootmap_size);
 
-	memblock_analyze();
 	unflatten_device_tree();
 
 	c6x_cache_init();