Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes

1 files changed, 4 insertions, 4 deletions

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 1efcacbed01a..15802a067a12 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -21,8 +21,7 @@
 #define VFL_TYPE_GRABBER        0
 #define VFL_TYPE_VBI            1
 #define VFL_TYPE_RADIO          2
-#define VFL_TYPE_VTX            3
-#define VFL_TYPE_MAX            4
+#define VFL_TYPE_MAX            3
 
 struct v4l2_ioctl_callbacks;
 struct video_device;
@@ -42,8 +41,6 @@ struct v4l2_file_operations {
         unsigned int (*poll) (struct file *, struct poll_table_struct *);
         long (*ioctl) (struct file *, unsigned int, unsigned long);
         long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
-        unsigned long (*get_unmapped_area) (struct file *, unsigned long,
-                                unsigned long, unsigned long, unsigned long);
         int (*mmap) (struct file *, struct vm_area_struct *);
         int (*open) (struct file *);
         int (*release) (struct file *);
@@ -97,6 +94,9 @@ struct video_device
 
         /* ioctl callbacks */
         const struct v4l2_ioctl_ops *ioctl_ops;
+
+        /* serialization lock */
+        struct mutex *lock;
 };
 
 /* dev to video-device */