diff options
-rw-r--r-- | arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index dff82eb57cd9..8036ad8ab046 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c | |||
@@ -32,12 +32,12 @@ | |||
32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
33 | #include <linux/dma-mapping.h> | 33 | #include <linux/dma-mapping.h> |
34 | #include <linux/leds.h> | 34 | #include <linux/leds.h> |
35 | #include <linux/memblock.h> | ||
36 | #include <media/soc_camera.h> | 35 | #include <media/soc_camera.h> |
37 | #include <sound/tlv320aic32x4.h> | 36 | #include <sound/tlv320aic32x4.h> |
38 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
39 | #include <asm/mach/arch.h> | 38 | #include <asm/mach/arch.h> |
40 | #include <asm/mach/time.h> | 39 | #include <asm/mach/time.h> |
40 | #include <asm/memblock.h> | ||
41 | #include <asm/system.h> | 41 | #include <asm/system.h> |
42 | #include <mach/common.h> | 42 | #include <mach/common.h> |
43 | #include <mach/iomux-mx27.h> | 43 | #include <mach/iomux-mx27.h> |
@@ -219,10 +219,8 @@ static void __init visstrim_camera_init(void) | |||
219 | static void __init visstrim_reserve(void) | 219 | static void __init visstrim_reserve(void) |
220 | { | 220 | { |
221 | /* reserve 4 MiB for mx2-camera */ | 221 | /* reserve 4 MiB for mx2-camera */ |
222 | mx2_camera_base = memblock_alloc(MX2_CAMERA_BUF_SIZE, | 222 | mx2_camera_base = memblock_steal(MX2_CAMERA_BUF_SIZE, |
223 | MX2_CAMERA_BUF_SIZE); | 223 | MX2_CAMERA_BUF_SIZE); |
224 | memblock_free(mx2_camera_base, MX2_CAMERA_BUF_SIZE); | ||
225 | memblock_remove(mx2_camera_base, MX2_CAMERA_BUF_SIZE); | ||
226 | } | 224 | } |
227 | 225 | ||
228 | /* GPIOs used as events for applications */ | 226 | /* GPIOs used as events for applications */ |