提交 0dfa9abd 编写于 作者: M Mauro Carvalho Chehab

V4L/DVB (4399): Fix a typo that caused some compat stuff to not work

Config option typo:
-#ifdef CONFIG_V4L1_COMPAT
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 3cdc0f26
...@@ -1225,7 +1225,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, ...@@ -1225,7 +1225,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
struct v4l2_format *f = arg; struct v4l2_format *f = arg;
return cx8800_try_fmt(dev,fh,f); return cx8800_try_fmt(dev,fh,f);
} }
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
/* --- streaming capture ------------------------------------- */ /* --- streaming capture ------------------------------------- */
case VIDIOCGMBUF: case VIDIOCGMBUF:
{ {
...@@ -1584,7 +1584,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, ...@@ -1584,7 +1584,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
*id = 0; *id = 0;
return 0; return 0;
} }
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
case VIDIOCSTUNER: case VIDIOCSTUNER:
{ {
struct video_tuner *v = arg; struct video_tuner *v = arg;
......
...@@ -2087,7 +2087,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, ...@@ -2087,7 +2087,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
struct v4l2_format *f = arg; struct v4l2_format *f = arg;
return saa7134_try_fmt(dev,fh,f); return saa7134_try_fmt(dev,fh,f);
} }
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
case VIDIOCGMBUF: case VIDIOCGMBUF:
{ {
struct video_mbuf *mbuf = arg; struct video_mbuf *mbuf = arg;
......
...@@ -202,7 +202,7 @@ static char *v4l2_memory_names[] = { ...@@ -202,7 +202,7 @@ static char *v4l2_memory_names[] = {
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
/* debug help functions */ /* debug help functions */
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
static const char *v4l1_ioctls[] = { static const char *v4l1_ioctls[] = {
[_IOC_NR(VIDIOCGCAP)] = "VIDIOCGCAP", [_IOC_NR(VIDIOCGCAP)] = "VIDIOCGCAP",
[_IOC_NR(VIDIOCGCHAN)] = "VIDIOCGCHAN", [_IOC_NR(VIDIOCGCHAN)] = "VIDIOCGCHAN",
...@@ -301,7 +301,7 @@ static const char *v4l2_ioctls[] = { ...@@ -301,7 +301,7 @@ static const char *v4l2_ioctls[] = {
#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
static const char *v4l2_int_ioctls[] = { static const char *v4l2_int_ioctls[] = {
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
[_IOC_NR(DECODER_GET_CAPABILITIES)] = "DECODER_GET_CAPABILITIES", [_IOC_NR(DECODER_GET_CAPABILITIES)] = "DECODER_GET_CAPABILITIES",
[_IOC_NR(DECODER_GET_STATUS)] = "DECODER_GET_STATUS", [_IOC_NR(DECODER_GET_STATUS)] = "DECODER_GET_STATUS",
[_IOC_NR(DECODER_SET_NORM)] = "DECODER_SET_NORM", [_IOC_NR(DECODER_SET_NORM)] = "DECODER_SET_NORM",
...@@ -367,7 +367,7 @@ void v4l_printk_ioctl(unsigned int cmd) ...@@ -367,7 +367,7 @@ void v4l_printk_ioctl(unsigned int cmd)
(_IOC_NR(cmd) < V4L2_INT_IOCTLS) ? (_IOC_NR(cmd) < V4L2_INT_IOCTLS) ?
v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd); v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);
break; break;
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
case 'v': case 'v':
printk("v4l1 ioctl %s, dir=%s (0x%08x)\n", printk("v4l1 ioctl %s, dir=%s (0x%08x)\n",
(_IOC_NR(cmd) < V4L1_IOCTLS) ? (_IOC_NR(cmd) < V4L1_IOCTLS) ?
......
...@@ -760,7 +760,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, ...@@ -760,7 +760,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
ret=vfd->vidioc_overlay(file, fh, *i); ret=vfd->vidioc_overlay(file, fh, *i);
break; break;
} }
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
/* --- streaming capture ------------------------------------- */ /* --- streaming capture ------------------------------------- */
case VIDIOCGMBUF: case VIDIOCGMBUF:
{ {
......
...@@ -986,7 +986,7 @@ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p) ...@@ -986,7 +986,7 @@ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p)
file->f_flags & O_NONBLOCK)); file->f_flags & O_NONBLOCK));
} }
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf) static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)
{ {
struct vivi_fh *fh=priv; struct vivi_fh *fh=priv;
...@@ -1328,7 +1328,7 @@ static struct video_device vivi = { ...@@ -1328,7 +1328,7 @@ static struct video_device vivi = {
.vidioc_s_ctrl = vidioc_s_ctrl, .vidioc_s_ctrl = vidioc_s_ctrl,
.vidioc_streamon = vidioc_streamon, .vidioc_streamon = vidioc_streamon,
.vidioc_streamoff = vidioc_streamoff, .vidioc_streamoff = vidioc_streamoff,
#ifdef CONFIG_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
.vidiocgmbuf = vidiocgmbuf, .vidiocgmbuf = vidiocgmbuf,
#endif #endif
.tvnorms = tvnorms, .tvnorms = tvnorms,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册