diff options
Diffstat (limited to 'linux/drivers/media/common/saa7146_video.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 46d571423..68d777bdf 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1007,10 +1007,6 @@ 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")); err = set_control(fh,arg); @@ -1119,10 +1115,6 @@ 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; @@ -1248,7 +1240,8 @@ static int buffer_activate (struct saa7146_dev *dev, return 0; } -static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,enum v4l2_field field) +static int buffer_prepare(struct videobuf_queue *q, + struct videobuf_buffer *vb, enum v4l2_field field) { struct file *file = q->priv_data; struct saa7146_fh *fh = file->private_data; |