diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /include/linux/videodev.h | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/videodev.h')
| -rw-r--r-- | include/linux/videodev.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/videodev.h b/include/linux/videodev.h index 41bc7e9603cd..8dba97a291f6 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h @@ -12,10 +12,10 @@ #ifndef __LINUX_VIDEODEV_H #define __LINUX_VIDEODEV_H -#define HAVE_V4L1 1 - #include <linux/videodev2.h> +#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__) + struct video_capability { char name[32]; @@ -336,6 +336,8 @@ struct video_code #define VID_HARDWARE_SN9C102 38 #define VID_HARDWARE_ARV 39 +#endif /* CONFIG_VIDEO_V4L1_COMPAT */ + #endif /* __LINUX_VIDEODEV_H */ /* |