X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Fvideodev.h;h=8dba97a291f67dda20e69bd7d35f11a43881587b;hb=577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d;hp=41bc7e9603cdf690debf168fc936252e9dad798e;hpb=2a2ed2db353d949c06b6ef8b6913f65b39111eab;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 41bc7e9603c..8dba97a291f 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 */
 
 /*