summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/vivi.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-23 16:15:17 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-23 16:15:17 -0300
commit319038fc56fe1ecc73765f1ce56f562a4fe15309 (patch)
tree679ae630e6b689dc6837b13250c95550587ff5c8 /linux/drivers/media/video/vivi.c
parentc8e0ee905cdfe4183f753600fcbbfe3114df03d5 (diff)
parent2b9b626849d56a89bbccfc172636a16cb2a513f1 (diff)
downloadmediapointer-dvb-s2-319038fc56fe1ecc73765f1ce56f562a4fe15309.tar.gz
mediapointer-dvb-s2-319038fc56fe1ecc73765f1ce56f562a4fe15309.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/mpeg-api
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/vivi.c')
-rw-r--r--linux/drivers/media/video/vivi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c
index 5fd42153f..614cdc60e 100644
--- a/linux/drivers/media/video/vivi.c
+++ b/linux/drivers/media/video/vivi.c
@@ -1092,7 +1092,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;
@@ -1107,7 +1107,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;