aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/palmtreo.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-pxa/palmtreo.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-pxa/palmtreo.c')
-rw-r--r--arch/arm/mach-pxa/palmtreo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
index f5db4f7d7158..3d0c9cc2a406 100644
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -20,7 +20,7 @@
20#include <linux/irq.h> 20#include <linux/irq.h>
21#include <linux/gpio_keys.h> 21#include <linux/gpio_keys.h>
22#include <linux/input.h> 22#include <linux/input.h>
23#include <linux/bootmem.h> 23#include <linux/memblock.h>
24#include <linux/pda_power.h> 24#include <linux/pda_power.h>
25#include <linux/pwm_backlight.h> 25#include <linux/pwm_backlight.h>
26#include <linux/gpio.h> 26#include <linux/gpio.h>
@@ -636,8 +636,8 @@ static void __init treo_lcd_power_init(void)
636 636
637static void __init treo_reserve(void) 637static void __init treo_reserve(void)
638{ 638{
639 reserve_bootmem(0xa0000000, 0x1000, BOOTMEM_EXCLUSIVE); 639 memblock_reserve(0xa0000000, 0x1000);
640 reserve_bootmem(0xa2000000, 0x1000, BOOTMEM_EXCLUSIVE); 640 memblock_reserve(0xa2000000, 0x1000);
641} 641}
642 642
643static void __init treo_init(void) 643static void __init treo_init(void)