diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm037.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pcm037.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c index d7e151669ed3..e48854b9d990 100644 --- a/arch/arm/mach-imx/mach-pcm037.c +++ b/arch/arm/mach-imx/mach-pcm037.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <asm/mach/arch.h> | 39 | #include <asm/mach/arch.h> |
40 | #include <asm/mach/time.h> | 40 | #include <asm/mach/time.h> |
41 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
42 | #include <asm/memblock.h> | ||
42 | #include <mach/common.h> | 43 | #include <mach/common.h> |
43 | #include <mach/hardware.h> | 44 | #include <mach/hardware.h> |
44 | #include <mach/iomux-mx3.h> | 45 | #include <mach/iomux-mx3.h> |
@@ -680,10 +681,8 @@ struct sys_timer pcm037_timer = { | |||
680 | static void __init pcm037_reserve(void) | 681 | static void __init pcm037_reserve(void) |
681 | { | 682 | { |
682 | /* reserve 4 MiB for mx3-camera */ | 683 | /* reserve 4 MiB for mx3-camera */ |
683 | mx3_camera_base = memblock_alloc(MX3_CAMERA_BUF_SIZE, | 684 | mx3_camera_base = arm_memblock_steal(MX3_CAMERA_BUF_SIZE, |
684 | MX3_CAMERA_BUF_SIZE); | 685 | MX3_CAMERA_BUF_SIZE); |
685 | memblock_free(mx3_camera_base, MX3_CAMERA_BUF_SIZE); | ||
686 | memblock_remove(mx3_camera_base, MX3_CAMERA_BUF_SIZE); | ||
687 | } | 686 | } |
688 | 687 | ||
689 | MACHINE_START(PCM037, "Phytec Phycore pcm037") | 688 | MACHINE_START(PCM037, "Phytec Phycore pcm037") |