diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 14:47:18 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 03:48:23 -0400 |
commit | 8d717a52d1b0959128be5134dd12608e8e4f2115 (patch) | |
tree | 6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6 /arch/arm/mach-s3c2410/mach-h1940.c | |
parent | 2778f62056ada442414392d7ccd41188bb631619 (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-s3c2410/mach-h1940.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 2407aab4d1b8..3ba3bab139d0 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.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/timer.h> | 19 | #include <linux/timer.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/sysdev.h> | 21 | #include <linux/sysdev.h> |
@@ -308,8 +308,8 @@ static void __init h1940_map_io(void) | |||
308 | /* H1940 and RX3715 need to reserve this for suspend */ | 308 | /* H1940 and RX3715 need to reserve this for suspend */ |
309 | static void __init h1940_reserve(void) | 309 | static void __init h1940_reserve(void) |
310 | { | 310 | { |
311 | reserve_bootmem(0x30003000, 0x1000, BOOTMEM_DEFAULT); | 311 | memblock_reserve(0x30003000, 0x1000); |
312 | reserve_bootmem(0x30081000, 0x1000, BOOTMEM_DEFAULT); | 312 | memblock_reserve(0x30081000, 0x1000); |
313 | } | 313 | } |
314 | 314 | ||
315 | static void __init h1940_init_irq(void) | 315 | static void __init h1940_init_irq(void) |