Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[~andy/linux] / include / media / v4l2-dev.h

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 5c416cdc88d5d44eae38ce5e8445d5c2de6d2c78..95d1c91770f4a4d37d6931b607ab4ae94d2a34a0 100644 (file)
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -26,6 +26,12 @@
 #define VFL_TYPE_SUBDEV                3
 #define VFL_TYPE_MAX           4
 
+/* Is this a receiver, transmitter or mem-to-mem? */
+/* Ignored for VFL_TYPE_SUBDEV. */
+#define VFL_DIR_RX             0
+#define VFL_DIR_TX             1
+#define VFL_DIR_M2M            2
+
 struct v4l2_ioctl_callbacks;
 struct video_device;
 struct v4l2_device;
@@ -39,9 +45,6 @@ struct v4l2_ctrl_handler;
 #define V4L2_FL_USES_V4L2_FH   (1)
 /* Use the prio field of v4l2_fh for core priority checking */
 #define V4L2_FL_USE_FH_PRIO    (2)
-/* If ioctl core locking is in use, then apply that also to all
-   file operations. Don't use this flag in new drivers! */
-#define V4L2_FL_LOCK_ALL_FOPS  (3)
 
 /* Priority helper functions */
 
@@ -108,7 +111,8 @@ struct video_device
 
        /* device info */
        char name[32];
-       int vfl_type;
+       int vfl_type;   /* device type */
+       int vfl_dir;    /* receiver, transmitter or m2m */
        /* 'minor' is set to -1 if the registration failed */
        int minor;
        u16 num;