V4L/DVB (8523): v4l2-dev: remove unused type and type2 field from video_device

The type and type2 fields were unused and so could be removed.
Instead add a vfl_type field that contains the type of the video
device.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 2fe38858516b..21419da44cb6 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -53,8 +53,7 @@ struct video_device
 
         /* device info */
         char name[32];
-        int type;                       /* v4l1 */
-        int type2;                      /* v4l2 */
+        int vfl_type;
         int minor;
         /* attribute to diferentiate multiple indexs on one physical device */
         int index;