From a55991b3a5b6dbd98b013dd3b384e5672b921399 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 27 Oct 2012 16:34:31 -0300
Subject: [PATCH] --- yaml --- r: 343861 b: refs/heads/master c:
 efe1724a4fa5840139a9a1aee9089f6854866fa0 h: refs/heads/master i:   343859:
 57aea33ba02db373eb351e2a58f3fe6191c56ff8 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/i2c/cx25840/cx25840-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 996170ce458d..8a057c0b05f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1fd287780c8e91fed4957b30c757b0c93021162
+refs/heads/master: efe1724a4fa5840139a9a1aee9089f6854866fa0
diff --git a/trunk/drivers/media/i2c/cx25840/cx25840-core.c b/trunk/drivers/media/i2c/cx25840/cx25840-core.c
index 2cee69e34184..f4149eb4d7b4 100644
--- a/trunk/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/trunk/drivers/media/i2c/cx25840/cx25840-core.c
@@ -2065,7 +2065,7 @@ static int cx25840_irq_handler(struct v4l2_subdev *sd, u32 status,
 #define DIF_BPF_COEFF3435	(0x38c)
 #define DIF_BPF_COEFF36		(0x390)
 
-void cx23885_dif_setup(struct i2c_client *client, u32 ifHz)
+static void cx23885_dif_setup(struct i2c_client *client, u32 ifHz)
 {
 	u64 pll_freq;
 	u32 pll_freq_word;