diff --git a/[refs] b/[refs]
index d5cce5b96ef5..38248036af20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbbfcb4e32532c9c5f0718a95b6c2a74b8ad50de
+refs/heads/master: 57fcfb6f935889c2086681d1bbc4ba0d47aeb768
diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c
index 80ada5882f62..c6c2166b00d5 100644
--- a/trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c
+++ b/trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c
@@ -213,7 +213,7 @@ static int fimc_pipeline_close(struct fimc_pipeline *p)
  * @pipeline: video pipeline structure
  * @on: passed as the s_stream call argument
  */
-int fimc_pipeline_s_stream(struct fimc_pipeline *p, bool on)
+static int fimc_pipeline_s_stream(struct fimc_pipeline *p, bool on)
 {
 	int i, ret;