diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-23 06:36:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-23 06:36:05 -0300 |
| commit | e160e6ddda8ec9db8131a415f9292e136a7e53ea (patch) | |
| tree | 869d67b82305f37e0000dbd45383b053708d4416 /linux/include | |
| parent | d4a534b7849eeee1e2b0bd61bd8e636dcf793ca1 (diff) | |
| parent | 6e22420a92d541cbda442f574570971f8b0252a7 (diff) | |
| download | mediapointer-dvb-s2-e160e6ddda8ec9db8131a415f9292e136a7e53ea.tar.gz mediapointer-dvb-s2-e160e6ddda8ec9db8131a415f9292e136a7e53ea.tar.bz2 | |
merge: master
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index 41bc7e960..518c7a321 100644 --- a/linux/include/linux/videodev.h +++ b/linux/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 */ /* |