diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-23 06:31:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-23 06:31:19 -0300 |
| commit | b4e1b90af5a9c2712330b9ed882e8953244be9a8 (patch) | |
| tree | 22a8009b3011758edc72864531354f7c3c899633 /linux/drivers/media/video/vivi.c | |
| parent | bb7f5a89eeea423828328f3af1b7097c15d60e7e (diff) | |
| download | mediapointer-dvb-s2-b4e1b90af5a9c2712330b9ed882e8953244be9a8.tar.gz mediapointer-dvb-s2-b4e1b90af5a9c2712330b9ed882e8953244be9a8.tar.bz2 | |
Fix for compilation without V4L1 or V4L1_COMPAT
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Removed usage of HAVE_V4L1
Including videodev.h will just include videodev2.h if V4L1 is not supported
V4L1 code at core drivers will honor CONFIG_V4L1_COMPAT stuff
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/vivi.c')
| -rw-r--r-- | linux/drivers/media/video/vivi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c index 092045d5b..0a75f4bda 100644 --- a/linux/drivers/media/video/vivi.c +++ b/linux/drivers/media/video/vivi.c @@ -1062,7 +1062,7 @@ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p) file->f_flags & O_NONBLOCK)); } -#ifdef HAVE_V4L1 +#ifdef CONFIG_V4L1_COMPAT static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf) { struct vivi_fh *fh=priv; @@ -1410,7 +1410,7 @@ static struct video_device vivi = { .vidioc_s_ctrl = vidioc_s_ctrl, .vidioc_streamon = vidioc_streamon, .vidioc_streamoff = vidioc_streamoff, -#ifdef HAVE_V4L1 +#ifdef CONFIG_V4L1_COMPAT .vidiocgmbuf = vidiocgmbuf, #endif .tvnorms = tvnorms, |