From bf8a493446c089cdf11e364afb65207dd98896af Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 10 May 2012 03:32:01 -0300
Subject: [PATCH] --- yaml --- r: 306487 b: refs/heads/master c:
 a13bba4f35eee67552b0fcfb0790d9a0f5f5fd07 h: refs/heads/master i:   306485:
 88652cc6188aa8324896f61157c260c9c160dbc0   306483:
 84a6b0de79bcfdd58a110d847ac3ffdde40a6ea2   306479:
 671ccb9d1c58050083437fc991dbfdd28421a92c v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/s5p-mfc/s5p_mfc.c     | 2 +-
 trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index abf3570ea7b7..aa522d082729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1259762facdcf31ea362997d9682ccc3d93d7346
+refs/heads/master: a13bba4f35eee67552b0fcfb0790d9a0f5f5fd07
diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c
index 9b7fe3375877..6fc22256847b 100644
--- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c
+++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c
@@ -70,7 +70,7 @@ static void wake_up_dev(struct s5p_mfc_dev *dev, unsigned int reason,
 	wake_up(&dev->queue);
 }
 
-void s5p_mfc_watchdog(unsigned long arg)
+static void s5p_mfc_watchdog(unsigned long arg)
 {
 	struct s5p_mfc_dev *dev = (struct s5p_mfc_dev *)arg;
 
diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
index a8028297fc70..e6217cbfa4a3 100644
--- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
+++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
@@ -296,7 +296,7 @@ void s5p_mfc_set_dec_desc_buffer(struct s5p_mfc_ctx *ctx)
 }
 
 /* Set registers for shared buffer */
-void s5p_mfc_set_shared_buffer(struct s5p_mfc_ctx *ctx)
+static void s5p_mfc_set_shared_buffer(struct s5p_mfc_ctx *ctx)
 {
 	struct s5p_mfc_dev *dev = ctx->dev;
 	mfc_write(dev, ctx->shm_ofs, S5P_FIMV_SI_CH0_HOST_WR_ADR);