diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-10 08:31:37 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-10 12:45:46 -0400 |
commit | c3ab204ccbe42d9eb60270e41110f2c5c9214952 (patch) | |
tree | c81d328cf77005c634ae162e03a2aa17bff3309d | |
parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) |
V4L/DVB (4494a): Fix compilation when V4L1 support is not present
VIDIOCGMBUF should be compiled only when V4L1 support is selected, since
this ioctl is from the obsoleted API.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/common/saa7146_video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 8393d472d3b8..7e0cedc557df 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -1190,6 +1190,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int | |||
1190 | } | 1190 | } |
1191 | return err; | 1191 | return err; |
1192 | } | 1192 | } |
1193 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
1193 | case VIDIOCGMBUF: | 1194 | case VIDIOCGMBUF: |
1194 | { | 1195 | { |
1195 | struct video_mbuf *mbuf = arg; | 1196 | struct video_mbuf *mbuf = arg; |
@@ -1218,6 +1219,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int | |||
1218 | mutex_unlock(&q->lock); | 1219 | mutex_unlock(&q->lock); |
1219 | return 0; | 1220 | return 0; |
1220 | } | 1221 | } |
1222 | #endif | ||
1221 | default: | 1223 | default: |
1222 | return v4l_compat_translate_ioctl(inode,file,cmd,arg, | 1224 | return v4l_compat_translate_ioctl(inode,file,cmd,arg, |
1223 | saa7146_video_do_ioctl); | 1225 | saa7146_video_do_ioctl); |