From e0e760e24c39699beabc0c04e1b884413e29ed21 Mon Sep 17 00:00:00 2001 From: Johannes Stezenbach Date: Tue, 6 Jan 2004 12:33:18 +0000 Subject: fix build with 2.6.1-rc1-mm2 (VIDIOC_S_CTRL_OLD / VIDIOC_OVERLAY_OLD) --- linux/drivers/media/common/saa7146_video.c | 6 ++++++ 1 file changed, 6 insertions(+) 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; -- cgit v1.2.3