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-29 17:22:30 -0300 |
| commit | 985bc96e27c729b8b686126ed26bba9fbaaf562d (patch) | |
| tree | 7a56baa3d895360cce47009ec8cbfc44574622c8 /include/linux/videodev.h | |
| parent | V4L/DVB (4342): Fix ext_controls align on 64 bit architectures (diff) | |
| download | linux-dev-985bc96e27c729b8b686126ed26bba9fbaaf562d.tar.xz linux-dev-985bc96e27c729b8b686126ed26bba9fbaaf562d.zip | |
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 'include/linux/videodev.h')
| -rw-r--r-- | include/linux/videodev.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/videodev.h b/include/linux/videodev.h index 41bc7e9603cd..518c7a32175e 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h @@ -12,10 +12,11 @@ #ifndef __LINUX_VIDEODEV_H #define __LINUX_VIDEODEV_H -#define HAVE_V4L1 1 - #include <linux/videodev2.h> +#ifdef CONFIG_VIDEO_V4L1_COMPAT +#define HAVE_V4L1 1 + struct video_capability { char name[32]; @@ -336,6 +337,8 @@ struct video_code #define VID_HARDWARE_SN9C102 38 #define VID_HARDWARE_ARV 39 +#endif /* CONFIG_VIDEO_V4L1_COMPAT */ + #endif /* __LINUX_VIDEODEV_H */ /* |