diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 19:47:18 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 08:48:23 +0100 |
commit | 8d717a52d1b0959128be5134dd12608e8e4f2115 (patch) | |
tree | 6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6 /arch/arm/mach-pxa/palmt5.c | |
parent | 2778f62056ada442414392d7ccd41188bb631619 (diff) | |
download | blackbird-op-linux-8d717a52d1b0959128be5134dd12608e8e4f2115.tar.gz blackbird-op-linux-8d717a52d1b0959128be5134dd12608e8e4f2115.zip |
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.c | 4 |
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) |