From 3109700a82dd460ed750c9dfc680941ed798611a Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 11 May 2012 04:38:14 -0300 Subject: [PATCH] --- yaml --- r: 306491 b: refs/heads/master c: 3e9095d54c3712ffda70dc84f9273d4b5d24c0fd h: refs/heads/master i: 306489: 137b6fd62523f7c795b8a3686dd14e8c30392c5e 306487: bf8a493446c089cdf11e364afb65207dd98896af v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5f06e545fdd0..99e11c8e2739 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f3bd320fc5a08f7892424978ad8e542357759a2 +refs/heads/master: 3e9095d54c3712ffda70dc84f9273d4b5d24c0fd diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c index dff9dc798795..acedb2004be3 100644 --- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c +++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c @@ -1436,7 +1436,8 @@ static const struct v4l2_ctrl_ops s5p_mfc_enc_ctrl_ops = { .s_ctrl = s5p_mfc_enc_s_ctrl, }; -int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *a) +static int vidioc_s_parm(struct file *file, void *priv, + struct v4l2_streamparm *a) { struct s5p_mfc_ctx *ctx = fh_to_ctx(priv); @@ -1452,7 +1453,8 @@ int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *a) return 0; } -int vidioc_g_parm(struct file *file, void *priv, struct v4l2_streamparm *a) +static int vidioc_g_parm(struct file *file, void *priv, + struct v4l2_streamparm *a) { struct s5p_mfc_ctx *ctx = fh_to_ctx(priv);