summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/palmt5.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-22 22:47:18 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-27 11:48:23 +0400
commit8d717a52d1b0959128be5134dd12608e8e4f2115 (patch)
tree6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6 /arch/arm/mach-pxa/palmt5.c
parent2778f62056ada442414392d7ccd41188bb631619 (diff)
downloadlinux-8d717a52d1b0959128be5134dd12608e8e4f2115.tar.xz
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-pxa/palmt5.c')
-rw-r--r--arch/arm/mach-pxa/palmt5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c
index 39fd788ab63b..5e92d84fe50d 100644
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -21,7 +21,7 @@
#include <linux/irq.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
#include <linux/pda_power.h>
#include <linux/pwm_backlight.h>
#include <linux/gpio.h>
@@ -399,7 +399,7 @@ static void __init palmt5_udc_init(void)
static void __init palmt5_reserve(void)
{
- reserve_bootmem(0xa0200000, 0x1000, BOOTMEM_EXCLUSIVE);
+ memblock_reserve(0xa0200000, 0x1000);
}
static void __init palmt5_init(void)