diff --git a/[refs] b/[refs]
index c7aa6887c28b..2424f6d286e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65271bff0fb11557d04d389df728d12dfba75dc3
+refs/heads/master: dc46ace15e50cb8af3f3072c00aaf3429770b0e2
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index 269c1b14cac5..41d23c8acbd8 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -1011,7 +1011,7 @@ static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)
 }
 #endif
 
-int vidioc_streamon (struct file *file, void *priv, enum v4l2_buf_type i)
+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 {
 	struct vivi_fh  *fh=priv;
 	struct vivi_dev *dev    = fh->dev;
@@ -1026,7 +1026,7 @@ int vidioc_streamon (struct file *file, void *priv, enum v4l2_buf_type i)
 	return (videobuf_streamon(&fh->vb_vidq));
 }
 
-int vidioc_streamoff (struct file *file, void *priv, enum v4l2_buf_type i)
+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
 {
 	struct vivi_fh  *fh=priv;
 	struct vivi_dev *dev    = fh->dev;