Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / drivers / media / platform / omap / omap_voutdef.h

diff --git a/drivers/media/platform/omap/omap_voutdef.h b/drivers/media/platform/omap/omap_voutdef.h
index 94b5d65afb19b95da62b1862a9aad7f96169b133..80c79fabdf95b463b49743515488d18c7fafed9b 100644 (file)
--- a/drivers/media/platform/omap/omap_voutdef.h
+++ b/drivers/media/platform/omap/omap_voutdef.h
@@ -11,6 +11,7 @@
 #ifndef OMAP_VOUTDEF_H
 #define OMAP_VOUTDEF_H
 
+#include <media/v4l2-ctrls.h>
 #include <video/omapfb_dss.h>
 #include <video/omapvrfb.h>
 
@@ -116,6 +117,7 @@ struct omap_vout_device {
        struct omapvideo_info vid_info;
        struct video_device *vfd;
        struct omap2video_device *vid_dev;
+       struct v4l2_ctrl_handler ctrl_handler;
        int vid;
        int opened;
 
@@ -149,12 +151,9 @@ struct omap_vout_device {
        /* Lock to protect the shared data structures in ioctl */
        struct mutex lock;
 
-       /* V4L2 control structure for different control id */
-       struct v4l2_control control[MAX_CID];
        enum dss_rotation rotation;
        bool mirror;
        int flicker_filter;
-       /* V4L2 control structure for different control id */
 
        int bpp; /* bytes per pixel */
        int vrfb_bpp; /* bytes per pixel with respect to VRFB */