summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-21 14:44:24 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2008-12-21 14:44:24 +0100
commit1fe56e49c1de689d7f2bcc334ff2eea0f4d794bd (patch)
treeddfb81f22b96eacc7c30e08a99316e6a7a317c37 /linux/drivers
parent1d90c2c80c8473756389c25bd3871c3a1eebbf3c (diff)
downloadmediapointer-dvb-s2-1fe56e49c1de689d7f2bcc334ff2eea0f4d794bd.tar.gz
mediapointer-dvb-s2-1fe56e49c1de689d7f2bcc334ff2eea0f4d794bd.tar.bz2
v4l2-compat32: add two additional #ifdef __OLD_VIDIOC_ lines
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/v4l2-compat-ioctl32.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/v4l2-compat-ioctl32.c b/linux/drivers/media/video/v4l2-compat-ioctl32.c
index 7a0c6b6a4..c9cb73a06 100644
--- a/linux/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/linux/drivers/media/video/v4l2-compat-ioctl32.c
@@ -700,7 +700,9 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
#define VIDIOC_TRY_EXT_CTRLS32 _IOWR('V', 73, struct v4l2_ext_controls32)
#define VIDIOC_OVERLAY32 _IOW ('V', 14, s32)
+#ifdef __OLD_VIDIOC_
#define VIDIOC_OVERLAY32_OLD _IOWR('V', 14, s32)
+#endif
#define VIDIOC_STREAMON32 _IOW ('V', 18, s32)
#define VIDIOC_STREAMOFF32 _IOW ('V', 19, s32)
#define VIDIOC_G_INPUT32 _IOR ('V', 38, s32)
@@ -758,7 +760,9 @@ static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg
case VIDIOC_S_EXT_CTRLS32: cmd = VIDIOC_S_EXT_CTRLS; break;
case VIDIOC_TRY_EXT_CTRLS32: cmd = VIDIOC_TRY_EXT_CTRLS; break;
case VIDIOC_OVERLAY32: cmd = VIDIOC_OVERLAY; break;
+#ifdef __OLD_VIDIOC_
case VIDIOC_OVERLAY32_OLD: cmd = VIDIOC_OVERLAY; break;
+#endif
case VIDIOC_STREAMON32: cmd = VIDIOC_STREAMON; break;
case VIDIOC_STREAMOFF32: cmd = VIDIOC_STREAMOFF; break;
case VIDIOC_G_INPUT32: cmd = VIDIOC_G_INPUT; break;