Merge branch 'linus' into timers/core

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

diff --git a/drivers/media/pci/meye/meye.h b/drivers/media/pci/meye/meye.h
index 6fed9274cfa530ad5904b669dda6a586373bec09..751be5e533c7e12eeff2ff40a78396223b4943b6 100644 (file)
--- a/drivers/media/pci/meye/meye.h
+++ b/drivers/media/pci/meye/meye.h
@@ -311,7 +311,7 @@ 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 *vdev;      /* video device parameters */
+       struct video_device vdev;       /* video device parameters */
        u16 brightness;
        u16 hue;
        u16 contrast;