diff options
| author |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-10 12:01:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-10 13:45:55 -0300 |
| commit | 8a905162e038367503bac732bf1e3e01c19158b9 (patch) | |
| tree | bf72a91df67baf47560812ceb756d1a19eb289c7 /drivers/media/video/zoran.h | |
| parent | V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900. (diff) | |
| download | linux-dev-8a905162e038367503bac732bf1e3e01c19158b9.tar.xz linux-dev-8a905162e038367503bac732bf1e3e01c19158b9.zip | |
V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install
V4L1 support should be disabled when no CONFIG_VIDEO_V4L1_COMPAT is defined,
to allow checking for broken V4L2 ports. This is very important during the
migration phase for V4L2 API.
However, userspace apps should be capable of using both APIs, since they need
to test at runtime, via VIDIOCGCAP ioctl, if V4L1 is supported. So, when
__KERNEL__ is not defined, those ioctls and corresponding structs should be
visible.
This patch also removes the obsolete defines HAVE_V4L1 and HAVE_V4L2, that
where causing some confusion, and were replaced by CONFIG_VIDEO_V4L1_COMPAT
and CONFIG_VIDEO_V4L2.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/zoran.h')
| -rw-r--r-- | drivers/media/video/zoran.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h index ffcda95ed9d4..8fb4a3414e0a 100644 --- a/drivers/media/video/zoran.h +++ b/drivers/media/video/zoran.h @@ -267,7 +267,7 @@ struct zoran_v4l_settings { }; /* whoops, this one is undeclared if !v4l2 */ -#ifndef HAVE_V4L2 +#ifndef CONFIG_VIDEO_V4L2 struct v4l2_jpegcompression { int quality; int APPn; |