From 0e5837e219df2ae1a2d4e6cc709ebed70ac2205d Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 27 Jul 2010 08:03:30 +0300
Subject: [PATCH] --- yaml --- r: 201685 b: refs/heads/master c:
 79d3c2c2395a89a70d25f0c77c11afc87efab89b h: refs/heads/master i:   201683:
 5098b4a7db62a8b656a7ee3db8c1d5eef2fb8be2 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/mx2_camera.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 250276a1a0ed..67bfb097774d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2066930de6296ef7470de11eaa9b8bc9129721e8
+refs/heads/master: 79d3c2c2395a89a70d25f0c77c11afc87efab89b
diff --git a/trunk/drivers/media/video/mx2_camera.c b/trunk/drivers/media/video/mx2_camera.c
index 98c93faa0c8d..026bef0ba403 100644
--- a/trunk/drivers/media/video/mx2_camera.c
+++ b/trunk/drivers/media/video/mx2_camera.c
@@ -238,7 +238,7 @@ struct mx2_camera_dev {
 
 	u32			csicr1;
 
-	void __iomem		*discard_buffer;
+	void			*discard_buffer;
 	dma_addr_t		discard_buffer_dma;
 	size_t			discard_size;
 };