aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/mach-rx1950.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-22 14:47:18 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-27 03:48:23 -0400
commit8d717a52d1b0959128be5134dd12608e8e4f2115 (patch)
tree6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6 /arch/arm/mach-s3c2440/mach-rx1950.c
parent2778f62056ada442414392d7ccd41188bb631619 (diff)
ARM: Convert platform reservations to use LMB rather than bootmem
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-rx1950.c')
-rw-r--r--arch/arm/mach-s3c2440/mach-rx1950.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c
index f26d5d60c13d..142d1f921176 100644
--- a/arch/arm/mach-s3c2440/mach-rx1950.c
+++ b/arch/arm/mach-s3c2440/mach-rx1950.c
@@ -15,7 +15,7 @@
15#include <linux/types.h> 15#include <linux/types.h>
16#include <linux/interrupt.h> 16#include <linux/interrupt.h>
17#include <linux/list.h> 17#include <linux/list.h>
18#include <linux/bootmem.h> 18#include <linux/memblock.h>
19#include <linux/delay.h> 19#include <linux/delay.h>
20#include <linux/timer.h> 20#include <linux/timer.h>
21#include <linux/init.h> 21#include <linux/init.h>
@@ -574,8 +574,8 @@ static void __init rx1950_init_machine(void)
574/* H1940 and RX3715 need to reserve this for suspend */ 574/* H1940 and RX3715 need to reserve this for suspend */
575static void __init rx1950_reserve(void) 575static void __init rx1950_reserve(void)
576{ 576{
577 reserve_bootmem(0x30003000, 0x1000, BOOTMEM_DEFAULT); 577 memblock_reserve(0x30003000, 0x1000);
578 reserve_bootmem(0x30081000, 0x1000, BOOTMEM_DEFAULT); 578 memblock_reserve(0x30081000, 0x1000);
579} 579}
580 580
581MACHINE_START(RX1950, "HP iPAQ RX1950") 581MACHINE_START(RX1950, "HP iPAQ RX1950")