Merge tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[muen/linux.git] / drivers / media / platform / vivid / vivid-core.h
index cd4c823..1891254 100644 (file)
@@ -136,6 +136,14 @@ struct vivid_cec_work {
 struct vivid_dev {
        unsigned                        inst;
        struct v4l2_device              v4l2_dev;
+#ifdef CONFIG_MEDIA_CONTROLLER
+       struct media_device             mdev;
+       struct media_pad                vid_cap_pad;
+       struct media_pad                vid_out_pad;
+       struct media_pad                vbi_cap_pad;
+       struct media_pad                vbi_out_pad;
+       struct media_pad                sdr_cap_pad;
+#endif
        struct v4l2_ctrl_handler        ctrl_hdl_user_gen;
        struct v4l2_ctrl_handler        ctrl_hdl_user_vid;
        struct v4l2_ctrl_handler        ctrl_hdl_user_aud;