From 8d717a52d1b0959128be5134dd12608e8e4f2115 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 22 May 2010 19:47:18 +0100
Subject: ARM: Convert platform reservations to use LMB rather than bootmem

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-u300/u300.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'arch/arm/mach-u300')

diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c
index 178dca4f9555..bfcda9820888 100644
--- a/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@ -14,7 +14,7 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <mach/hardware.h>
@@ -33,7 +33,7 @@ static void __init u300_reserve(void)
 #ifdef CONFIG_MACH_U300_SINGLE_RAM
 #if ((CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1) == 1) && \
 	CONFIG_MACH_U300_2MB_ALIGNMENT_FIX
-        reserve_bootmem(PHYS_OFFSET, 0x00100000, BOOTMEM_DEFAULT);
+        memblock_reserve(PHYS_OFFSET, 0x00100000);
 #endif
 #endif
 }
-- 
cgit v1.2.1