summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/common/saa7146_video.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index e4f83f42e..819019339 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -964,7 +964,10 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
return get_control(fh,arg);
}
case VIDIOC_S_CTRL:
+/* FIXME: remove when videodev2.h update is in kernel */
+#ifdef VIDIOC_S_CTRL_OLD
case VIDIOC_S_CTRL_OLD:
+#endif
{
DEB_EE(("VIDIOC_S_CTRL\n"));
down(&dev->lock);
@@ -1075,7 +1078,10 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
return 0;
}
case VIDIOC_OVERLAY:
+/* FIXME: remove when videodev2.h update is in kernel */
+#ifdef VIDIOC_OVERLAY_OLD
case VIDIOC_OVERLAY_OLD:
+#endif
{
int on = *(int *)arg;
int err = 0;