diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-23 05:31:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-29 16:22:30 -0400 |
commit | 985bc96e27c729b8b686126ed26bba9fbaaf562d (patch) | |
tree | 7a56baa3d895360cce47009ec8cbfc44574622c8 /drivers/media/video/cx88 | |
parent | f251d23eaee673524171b24a71a8794acf82783e (diff) |
V4L/DVB (4343): Fix for compilation without V4L1 or V4L1_COMPAT
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 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 2225d4b94140..ff4e7ed76b08 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1226,7 +1226,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, | |||
1226 | struct v4l2_format *f = arg; | 1226 | struct v4l2_format *f = arg; |
1227 | return cx8800_try_fmt(dev,fh,f); | 1227 | return cx8800_try_fmt(dev,fh,f); |
1228 | } | 1228 | } |
1229 | #ifdef HAVE_V4L1 | 1229 | #ifdef CONFIG_V4L1_COMPAT |
1230 | /* --- streaming capture ------------------------------------- */ | 1230 | /* --- streaming capture ------------------------------------- */ |
1231 | case VIDIOCGMBUF: | 1231 | case VIDIOCGMBUF: |
1232 | { | 1232 | { |
@@ -1585,7 +1585,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, | |||
1585 | *id = 0; | 1585 | *id = 0; |
1586 | return 0; | 1586 | return 0; |
1587 | } | 1587 | } |
1588 | #ifdef HAVE_V4L1 | 1588 | #ifdef CONFIG_V4L1_COMPAT |
1589 | case VIDIOCSTUNER: | 1589 | case VIDIOCSTUNER: |
1590 | { | 1590 | { |
1591 | struct video_tuner *v = arg; | 1591 | struct video_tuner *v = arg; |