diff options
Diffstat (limited to 'drivers/media/video/s2255drv.c')
-rw-r--r-- | drivers/media/video/s2255drv.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index cf03372d1d17..b63f8cafa671 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c | |||
@@ -1097,15 +1097,6 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p) | |||
1097 | return rc; | 1097 | return rc; |
1098 | } | 1098 | } |
1099 | 1099 | ||
1100 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1101 | static int vidioc_cgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) | ||
1102 | { | ||
1103 | struct s2255_fh *fh = priv; | ||
1104 | |||
1105 | return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8); | ||
1106 | } | ||
1107 | #endif | ||
1108 | |||
1109 | /* write to the configuration pipe, synchronously */ | 1100 | /* write to the configuration pipe, synchronously */ |
1110 | static int s2255_write_config(struct usb_device *udev, unsigned char *pbuf, | 1101 | static int s2255_write_config(struct usb_device *udev, unsigned char *pbuf, |
1111 | int size) | 1102 | int size) |
@@ -1909,9 +1900,6 @@ static const struct v4l2_ioctl_ops s2255_ioctl_ops = { | |||
1909 | .vidioc_s_ctrl = vidioc_s_ctrl, | 1900 | .vidioc_s_ctrl = vidioc_s_ctrl, |
1910 | .vidioc_streamon = vidioc_streamon, | 1901 | .vidioc_streamon = vidioc_streamon, |
1911 | .vidioc_streamoff = vidioc_streamoff, | 1902 | .vidioc_streamoff = vidioc_streamoff, |
1912 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1913 | .vidiocgmbuf = vidioc_cgmbuf, | ||
1914 | #endif | ||
1915 | .vidioc_s_jpegcomp = vidioc_s_jpegcomp, | 1903 | .vidioc_s_jpegcomp = vidioc_s_jpegcomp, |
1916 | .vidioc_g_jpegcomp = vidioc_g_jpegcomp, | 1904 | .vidioc_g_jpegcomp = vidioc_g_jpegcomp, |
1917 | .vidioc_s_parm = vidioc_s_parm, | 1905 | .vidioc_s_parm = vidioc_s_parm, |