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/em28xx | |
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/em28xx')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 908e3bc88303..7be9bbad79ba 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1934,19 +1934,6 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) | |||
1934 | O_NONBLOCK); | 1934 | O_NONBLOCK); |
1935 | } | 1935 | } |
1936 | 1936 | ||
1937 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1938 | static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) | ||
1939 | { | ||
1940 | struct em28xx_fh *fh = priv; | ||
1941 | |||
1942 | if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
1943 | return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8); | ||
1944 | else | ||
1945 | return videobuf_cgmbuf(&fh->vb_vbiq, mbuf, 8); | ||
1946 | } | ||
1947 | #endif | ||
1948 | |||
1949 | |||
1950 | /* ----------------------------------------------------------- */ | 1937 | /* ----------------------------------------------------------- */ |
1951 | /* RADIO ESPECIFIC IOCTLS */ | 1938 | /* RADIO ESPECIFIC IOCTLS */ |
1952 | /* ----------------------------------------------------------- */ | 1939 | /* ----------------------------------------------------------- */ |
@@ -2359,9 +2346,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
2359 | .vidioc_s_register = vidioc_s_register, | 2346 | .vidioc_s_register = vidioc_s_register, |
2360 | .vidioc_g_chip_ident = vidioc_g_chip_ident, | 2347 | .vidioc_g_chip_ident = vidioc_g_chip_ident, |
2361 | #endif | 2348 | #endif |
2362 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
2363 | .vidiocgmbuf = vidiocgmbuf, | ||
2364 | #endif | ||
2365 | }; | 2349 | }; |
2366 | 2350 | ||
2367 | static const struct video_device em28xx_video_template = { | 2351 | static const struct video_device em28xx_video_template = { |