aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-21 08:44:24 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:39:23 -0500
commit15029b39bb95a765b57ad81f5062718b10422072 (patch)
treef965fdf0a5f1b67e4b64f4641be0886bd411117a
parent92f45badbbaccdbc1be25085292a1e258948e221 (diff)
V4L/DVB (9934): v4l2-compat32: add two additional #ifdef __OLD_VIDIOC_ lines
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/v4l2-compat-ioctl32.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index 5084773d4f10..d0e1bd3ace6a 100644
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -695,7 +695,9 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
695#define VIDIOC_TRY_EXT_CTRLS32 _IOWR('V', 73, struct v4l2_ext_controls32) 695#define VIDIOC_TRY_EXT_CTRLS32 _IOWR('V', 73, struct v4l2_ext_controls32)
696 696
697#define VIDIOC_OVERLAY32 _IOW ('V', 14, s32) 697#define VIDIOC_OVERLAY32 _IOW ('V', 14, s32)
698#ifdef __OLD_VIDIOC_
698#define VIDIOC_OVERLAY32_OLD _IOWR('V', 14, s32) 699#define VIDIOC_OVERLAY32_OLD _IOWR('V', 14, s32)
700#endif
699#define VIDIOC_STREAMON32 _IOW ('V', 18, s32) 701#define VIDIOC_STREAMON32 _IOW ('V', 18, s32)
700#define VIDIOC_STREAMOFF32 _IOW ('V', 19, s32) 702#define VIDIOC_STREAMOFF32 _IOW ('V', 19, s32)
701#define VIDIOC_G_INPUT32 _IOR ('V', 38, s32) 703#define VIDIOC_G_INPUT32 _IOR ('V', 38, s32)
@@ -753,7 +755,9 @@ static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg
753 case VIDIOC_S_EXT_CTRLS32: cmd = VIDIOC_S_EXT_CTRLS; break; 755 case VIDIOC_S_EXT_CTRLS32: cmd = VIDIOC_S_EXT_CTRLS; break;
754 case VIDIOC_TRY_EXT_CTRLS32: cmd = VIDIOC_TRY_EXT_CTRLS; break; 756 case VIDIOC_TRY_EXT_CTRLS32: cmd = VIDIOC_TRY_EXT_CTRLS; break;
755 case VIDIOC_OVERLAY32: cmd = VIDIOC_OVERLAY; break; 757 case VIDIOC_OVERLAY32: cmd = VIDIOC_OVERLAY; break;
758#ifdef __OLD_VIDIOC_
756 case VIDIOC_OVERLAY32_OLD: cmd = VIDIOC_OVERLAY; break; 759 case VIDIOC_OVERLAY32_OLD: cmd = VIDIOC_OVERLAY; break;
760#endif
757 case VIDIOC_STREAMON32: cmd = VIDIOC_STREAMON; break; 761 case VIDIOC_STREAMON32: cmd = VIDIOC_STREAMON; break;
758 case VIDIOC_STREAMOFF32: cmd = VIDIOC_STREAMOFF; break; 762 case VIDIOC_STREAMOFF32: cmd = VIDIOC_STREAMOFF; break;
759 case VIDIOC_G_INPUT32: cmd = VIDIOC_G_INPUT; break; 763 case VIDIOC_G_INPUT32: cmd = VIDIOC_G_INPUT; break;