summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-09-10 09:31:37 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-10 13:45:46 -0300
commitc3ab204ccbe42d9eb60270e41110f2c5c9214952 (patch)
treec81d328cf77005c634ae162e03a2aa17bff3309d /drivers
parent38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff)
downloadop-kernel-dev-c3ab204ccbe42d9eb60270e41110f2c5c9214952.zip
op-kernel-dev-c3ab204ccbe42d9eb60270e41110f2c5c9214952.tar.gz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/saa7146_video.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 8393d47..7e0cedc5 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
}
return err;
}
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
case VIDIOCGMBUF:
{
struct video_mbuf *mbuf = arg;
@@ -1218,6 +1219,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
mutex_unlock(&q->lock);
return 0;
}
+#endif
default:
return v4l_compat_translate_ioctl(inode,file,cmd,arg,
saa7146_video_do_ioctl);
OpenPOWER on IntegriCloud