ide: rework the code for selecting the best DMA transfer mode (v3)

[powerpc.git] / include / linux / videodev.h

diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 5b62055..8dba97a 100644 (file)
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -12,17 +12,10 @@
 #ifndef __LINUX_VIDEODEV_H
 #define __LINUX_VIDEODEV_H
 
-#include <linux/types.h>
-#include <linux/poll.h>
-#include <linux/fs.h>
-#include <linux/device.h>
-#include <linux/mutex.h>
-#include <linux/compiler.h> /* need __user */
-
-#define HAVE_V4L1 1
-
 #include <linux/videodev2.h>
 
+#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
+
 struct video_capability
 {
        char name[32];
@@ -343,9 +336,7 @@ struct video_code
 #define VID_HARDWARE_SN9C102   38
 #define VID_HARDWARE_ARV       39
 
-#ifdef __KERNEL__
-#include <media/v4l2-dev.h>
-#endif /* __KERNEL__ */
+#endif /* CONFIG_VIDEO_V4L1_COMPAT */
 
 #endif /* __LINUX_VIDEODEV_H */