diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index caeb47c68b8b..632ebe8724ec 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -30,6 +30,9 @@ | |||
30 | #include "saa7134-reg.h" | 30 | #include "saa7134-reg.h" |
31 | #include "saa7134.h" | 31 | #include "saa7134.h" |
32 | 32 | ||
33 | /* Include V4L1 specific functions. Should be removed soon */ | ||
34 | #include <linux/videodev.h> | ||
35 | |||
33 | /* ------------------------------------------------------------------ */ | 36 | /* ------------------------------------------------------------------ */ |
34 | 37 | ||
35 | static unsigned int video_debug = 0; | 38 | static unsigned int video_debug = 0; |
@@ -2060,7 +2063,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, | |||
2060 | struct v4l2_format *f = arg; | 2063 | struct v4l2_format *f = arg; |
2061 | return saa7134_try_fmt(dev,fh,f); | 2064 | return saa7134_try_fmt(dev,fh,f); |
2062 | } | 2065 | } |
2063 | 2066 | #ifdef HAVE_V4L1 | |
2064 | case VIDIOCGMBUF: | 2067 | case VIDIOCGMBUF: |
2065 | { | 2068 | { |
2066 | struct video_mbuf *mbuf = arg; | 2069 | struct video_mbuf *mbuf = arg; |
@@ -2085,6 +2088,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, | |||
2085 | } | 2088 | } |
2086 | return 0; | 2089 | return 0; |
2087 | } | 2090 | } |
2091 | #endif | ||
2088 | case VIDIOC_REQBUFS: | 2092 | case VIDIOC_REQBUFS: |
2089 | return videobuf_reqbufs(saa7134_queue(fh),arg); | 2093 | return videobuf_reqbufs(saa7134_queue(fh),arg); |
2090 | 2094 | ||