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 /include/media/videobuf-core.h | |
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 'include/media/videobuf-core.h')
-rw-r--r-- | include/media/videobuf-core.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 1d3835fc26be..90ed895e217d 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
@@ -17,10 +17,6 @@ | |||
17 | #define _VIDEOBUF_CORE_H | 17 | #define _VIDEOBUF_CORE_H |
18 | 18 | ||
19 | #include <linux/poll.h> | 19 | #include <linux/poll.h> |
20 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
21 | #define __MIN_V4L1 | ||
22 | #include <linux/videodev.h> | ||
23 | #endif | ||
24 | #include <linux/videodev2.h> | 20 | #include <linux/videodev2.h> |
25 | 21 | ||
26 | #define UNSET (-1U) | 22 | #define UNSET (-1U) |
@@ -212,10 +208,6 @@ int videobuf_qbuf(struct videobuf_queue *q, | |||
212 | struct v4l2_buffer *b); | 208 | struct v4l2_buffer *b); |
213 | int videobuf_dqbuf(struct videobuf_queue *q, | 209 | int videobuf_dqbuf(struct videobuf_queue *q, |
214 | struct v4l2_buffer *b, int nonblocking); | 210 | struct v4l2_buffer *b, int nonblocking); |
215 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
216 | int videobuf_cgmbuf(struct videobuf_queue *q, | ||
217 | struct video_mbuf *mbuf, int count); | ||
218 | #endif | ||
219 | int videobuf_streamon(struct videobuf_queue *q); | 211 | int videobuf_streamon(struct videobuf_queue *q); |
220 | int videobuf_streamoff(struct videobuf_queue *q); | 212 | int videobuf_streamoff(struct videobuf_queue *q); |
221 | 213 | ||