diff options
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r-- | drivers/media/video/vivi.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 9797e5a69265..c49c39386bd0 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -870,15 +870,6 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p) | |||
870 | file->f_flags & O_NONBLOCK); | 870 | file->f_flags & O_NONBLOCK); |
871 | } | 871 | } |
872 | 872 | ||
873 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
874 | static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) | ||
875 | { | ||
876 | struct vivi_dev *dev = video_drvdata(file); | ||
877 | |||
878 | return videobuf_cgmbuf(&dev->vb_vidq, mbuf, 8); | ||
879 | } | ||
880 | #endif | ||
881 | |||
882 | static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i) | 873 | static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i) |
883 | { | 874 | { |
884 | struct vivi_dev *dev = video_drvdata(file); | 875 | struct vivi_dev *dev = video_drvdata(file); |
@@ -1105,9 +1096,6 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = { | |||
1105 | .vidioc_queryctrl = vidioc_queryctrl, | 1096 | .vidioc_queryctrl = vidioc_queryctrl, |
1106 | .vidioc_g_ctrl = vidioc_g_ctrl, | 1097 | .vidioc_g_ctrl = vidioc_g_ctrl, |
1107 | .vidioc_s_ctrl = vidioc_s_ctrl, | 1098 | .vidioc_s_ctrl = vidioc_s_ctrl, |
1108 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1109 | .vidiocgmbuf = vidiocgmbuf, | ||
1110 | #endif | ||
1111 | }; | 1099 | }; |
1112 | 1100 | ||
1113 | static struct video_device vivi_template = { | 1101 | static struct video_device vivi_template = { |