diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-24 08:33:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:17:07 -0500 |
commit | 08af245de0cf6ab5f4ed008ee2bb99273774fce0 (patch) | |
tree | d07a9b38eb4b9442ef0e935063a5f7f40248e19e /drivers/media/video/cx231xx | |
parent | b69a219e0e97441dbeb0262cf85468b61a161399 (diff) |
[media] V4L: remove V4L1 compatibility mode
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-video.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c index b13b69fb2af6..7e3e8c4f19b7 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c | |||
@@ -2044,15 +2044,6 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) | |||
2044 | return videobuf_dqbuf(&fh->vb_vidq, b, file->f_flags & O_NONBLOCK); | 2044 | return videobuf_dqbuf(&fh->vb_vidq, b, file->f_flags & O_NONBLOCK); |
2045 | } | 2045 | } |
2046 | 2046 | ||
2047 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
2048 | static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) | ||
2049 | { | ||
2050 | struct cx231xx_fh *fh = priv; | ||
2051 | |||
2052 | return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8); | ||
2053 | } | ||
2054 | #endif | ||
2055 | |||
2056 | /* ----------------------------------------------------------- */ | 2047 | /* ----------------------------------------------------------- */ |
2057 | /* RADIO ESPECIFIC IOCTLS */ | 2048 | /* RADIO ESPECIFIC IOCTLS */ |
2058 | /* ----------------------------------------------------------- */ | 2049 | /* ----------------------------------------------------------- */ |
@@ -2507,9 +2498,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
2507 | .vidioc_g_register = vidioc_g_register, | 2498 | .vidioc_g_register = vidioc_g_register, |
2508 | .vidioc_s_register = vidioc_s_register, | 2499 | .vidioc_s_register = vidioc_s_register, |
2509 | #endif | 2500 | #endif |
2510 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
2511 | .vidiocgmbuf = vidiocgmbuf, | ||
2512 | #endif | ||
2513 | }; | 2501 | }; |
2514 | 2502 | ||
2515 | static struct video_device cx231xx_vbi_template; | 2503 | static struct video_device cx231xx_vbi_template; |