These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / platform / marvell-ccic / mcam-core.h

diff --git a/kernel/drivers/media/platform/marvell-ccic/mcam-core.h b/kernel/drivers/media/platform/marvell-ccic/mcam-core.h
index 7ffdf4d..35cd9e5 100644 (file)
--- a/kernel/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/kernel/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -10,7 +10,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-dev.h>
-#include <media/videobuf2-core.h>
+#include <media/videobuf2-v4l2.h>
 
 /*
  * Create our own symbols for the supported buffer modes, but, for now,
@@ -146,7 +146,6 @@ struct mcam_camera {
        struct v4l2_ctrl_handler ctrl_handler;
        enum mcam_state state;
        unsigned long flags;            /* Buffer status, mainly (dev_lock) */
-       int users;                      /* How many open FDs */
 
        struct mcam_frame_state frame_state;    /* Frame state counter */
        /*
@@ -163,6 +162,8 @@ struct mcam_camera {
        unsigned int nbufs;             /* How many are alloc'd */
        int next_buf;                   /* Next to consume (dev_lock) */
 
+       char bus_info[32];              /* querycap bus_info */
+
        /* DMA buffers - vmalloc mode */
 #ifdef MCAM_MODE_VMALLOC
        unsigned int dma_buf_size;      /* allocated size */