From 9ceb257b76bc1b8be21f864108c2c2774cb785a5 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Sat, 13 Oct 2012 07:18:34 -0300
Subject: [PATCH] --- yaml --- r: 343775 b: refs/heads/master c:
 e1393b5992b2b5b20b086c5f587e6c269d68e157 h: refs/heads/master i:   343773:
 4ab4621c8958c499ba6cd607386bece93d2b4fb8   343771:
 e209adc9a1919a1d554f8b052d64aa8d340a0aa3   343767:
 a6ece2deca035a5c8f3285bd859504aec74b329d   343759:
 768a775dd11a231517a0158b337f62853038ee2a   343743:
 fa8536d2740b2655859776819c06797c3fca4491 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8de7f997c1f8..c5bcd59045ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff38c21663c5f9b8d33cf2979e07e811f2560161
+refs/heads/master: e1393b5992b2b5b20b086c5f587e6c269d68e157
diff --git a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 2af6d522f4ac..5c1d727268be 100644
--- a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -1542,7 +1542,7 @@ int vidioc_encoder_cmd(struct file *file, void *priv,
 }
 
 static int vidioc_subscribe_event(struct v4l2_fh *fh,
-					struct v4l2_event_subscription *sub)
+				  const struct v4l2_event_subscription *sub)
 {
 	switch (sub->type) {
 	case V4L2_EVENT_EOS: