From 2778f62056ada442414392d7ccd41188bb631619 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 9 Jul 2010 16:27:52 +0100
Subject: ARM: initial LMB trial

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/kernel/setup.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'arch/arm/kernel/setup.c')

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 387d2e9cb51f..dfd293477751 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -25,6 +25,7 @@
 #include <linux/smp.h>
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
+#include <linux/memblock.h>
 
 #include <asm/unified.h>
 #include <asm/cpu.h>
@@ -715,6 +716,8 @@ void __init setup_arch(char **cmdline_p)
 
 	parse_early_param();
 
+	arm_memblock_init(&meminfo);
+
 	paging_init(mdesc);
 	request_standard_resources(&meminfo, mdesc);
 
-- 
cgit v1.2.1