From ed80b03b1749f7704959bfcf9e87d064fdded75d Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 29 Aug 2012 11:12:56 +0100
Subject: [PATCH] --- yaml --- r: 331464 b: refs/heads/master c:
 895576427dca617d0b1cc9dd2c450d82c58d67a9 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0c09a4a40599..97f801c23b9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5dfdbe0c70c8c032a2962ccd51f163388def148
+refs/heads/master: 895576427dca617d0b1cc9dd2c450d82c58d67a9
diff --git a/trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index dff82eb57cd9..8036ad8ab046 100644
--- a/trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -32,12 +32,12 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/leds.h>
-#include <linux/memblock.h>
 #include <media/soc_camera.h>
 #include <sound/tlv320aic32x4.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
+#include <asm/memblock.h>
 #include <asm/system.h>
 #include <mach/common.h>
 #include <mach/iomux-mx27.h>
@@ -219,10 +219,8 @@ static void __init visstrim_camera_init(void)
 static void __init visstrim_reserve(void)
 {
 	/* reserve 4 MiB for mx2-camera */
-	mx2_camera_base = memblock_alloc(MX2_CAMERA_BUF_SIZE,
+	mx2_camera_base = memblock_steal(MX2_CAMERA_BUF_SIZE,
 			MX2_CAMERA_BUF_SIZE);
-	memblock_free(mx2_camera_base, MX2_CAMERA_BUF_SIZE);
-	memblock_remove(mx2_camera_base, MX2_CAMERA_BUF_SIZE);
 }
 
 /* GPIOs used as events for applications */