diff --git a/[refs] b/[refs]
index 502e4e6b6ba0..b57bd9294808 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c4c03f3819dc6c0e294d47558ed8c07cd3fb15e
+refs/heads/master: 21ec9c97e4ee568aad169327256c768947e57c1e
diff --git a/trunk/drivers/media/platform/s5p-g2d/g2d.c b/trunk/drivers/media/platform/s5p-g2d/g2d.c
index 1e3b9dd014c0..1bfbc325836b 100644
--- a/trunk/drivers/media/platform/s5p-g2d/g2d.c
+++ b/trunk/drivers/media/platform/s5p-g2d/g2d.c
@@ -507,7 +507,7 @@ static int vidioc_g_crop(struct file *file, void *prv, struct v4l2_crop *cr)
 	return 0;
 }
 
-static int vidioc_try_crop(struct file *file, void *prv, struct v4l2_crop *cr)
+static int vidioc_try_crop(struct file *file, void *prv, const struct v4l2_crop *cr)
 {
 	struct g2d_ctx *ctx = prv;
 	struct g2d_dev *dev = ctx->dev;