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;
 };