diff --git a/[refs] b/[refs]
index c014e64f7fcc..5cdd07a8ef64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66f93178042b6f151552fdb74cbaa2724e59c97c
+refs/heads/master: a3f17af2d97a2a51af37e7b1dab5de5562c9b66d
diff --git a/trunk/drivers/media/pci/cx25821/cx25821-video.c b/trunk/drivers/media/pci/cx25821/cx25821-video.c
index 3ba856a2a9f3..d270819fd875 100644
--- a/trunk/drivers/media/pci/cx25821/cx25821-video.c
+++ b/trunk/drivers/media/pci/cx25821/cx25821-video.c
@@ -762,7 +762,8 @@ static int cx25821_vidioc_g_std(struct file *file, void *priv, v4l2_std_id *tvno
 	return 0;
 }
 
-int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id tvnorms)
+static int cx25821_vidioc_s_std(struct file *file, void *priv,
+				v4l2_std_id tvnorms)
 {
 	struct cx25821_channel *chan = video_drvdata(file);
 	struct cx25821_dev *dev = chan->dev;