Merge tag 'md-3.3-fixes' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / meye.h

diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index 1321ad5d659701a2feb4c132bf203e53af96c429..4bdeb03f16440eb6498f29c5a7cd7180e7a23333 100644 (file)
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -31,7 +31,7 @@
 #define _MEYE_PRIV_H_
 
 #define MEYE_DRIVER_MAJORVERSION        1
-#define MEYE_DRIVER_MINORVERSION       13
+#define MEYE_DRIVER_MINORVERSION       14
 
 #define MEYE_DRIVER_VERSION __stringify(MEYE_DRIVER_MAJORVERSION) "." \
                            __stringify(MEYE_DRIVER_MINORVERSION)
@@ -289,6 +289,7 @@ struct meye_grab_buffer {
 
 /* Motion Eye device structure */
 struct meye {
+       struct v4l2_device v4l2_dev;    /* Main v4l2_device struct */
        struct pci_dev *mchip_dev;      /* pci device */
        u8 mchip_irq;                   /* irq */
        u8 mchip_mode;                  /* actual mchip mode: HIC_MODE... */
@@ -308,8 +309,11 @@ struct meye {
        struct kfifo doneq;             /* queue for grabbed buffers */
        spinlock_t doneq_lock;          /* lock protecting the queue */
        wait_queue_head_t proc_list;    /* wait queue */
-       struct video_device *video_dev; /* video device parameters */
-       struct video_picture picture;   /* video picture parameters */
+       struct video_device *vdev;      /* video device parameters */
+       u16 brightness;
+       u16 hue;
+       u16 contrast;
+       u16 colour;
        struct meye_params params;      /* additional parameters */
        unsigned long in_use;           /* set to 1 if the device is in use */
 #ifdef CONFIG_PM