diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31moboard.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx31moboard.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index b95981dacb2b..f225262b5c38 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <asm/mach/arch.h> | 41 | #include <asm/mach/arch.h> |
42 | #include <asm/mach/time.h> | 42 | #include <asm/mach/time.h> |
43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
44 | #include <asm/memblock.h> | ||
44 | #include <mach/board-mx31moboard.h> | 45 | #include <mach/board-mx31moboard.h> |
45 | #include <mach/common.h> | 46 | #include <mach/common.h> |
46 | #include <mach/hardware.h> | 47 | #include <mach/hardware.h> |
@@ -584,10 +585,8 @@ struct sys_timer mx31moboard_timer = { | |||
584 | static void __init mx31moboard_reserve(void) | 585 | static void __init mx31moboard_reserve(void) |
585 | { | 586 | { |
586 | /* reserve 4 MiB for mx3-camera */ | 587 | /* reserve 4 MiB for mx3-camera */ |
587 | mx3_camera_base = memblock_alloc(MX3_CAMERA_BUF_SIZE, | 588 | mx3_camera_base = arm_memblock_steal(MX3_CAMERA_BUF_SIZE, |
588 | MX3_CAMERA_BUF_SIZE); | 589 | MX3_CAMERA_BUF_SIZE); |
589 | memblock_free(mx3_camera_base, MX3_CAMERA_BUF_SIZE); | ||
590 | memblock_remove(mx3_camera_base, MX3_CAMERA_BUF_SIZE); | ||
591 | } | 590 | } |
592 | 591 | ||
593 | MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") | 592 | MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") |