Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/fsl', 'asoc/fix/tegra...

[~andy/linux] / drivers / media / pci / saa7164 / saa7164.h

diff --git a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h
index 437284e747c973d5a3025eb1c39e989313891a08..8b29e89903014b4fbf4b0ab9a0f76f90f416280c 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164.h
+++ b/drivers/media/pci/saa7164/saa7164.h
@@ -63,7 +63,7 @@
 #include <dmxdev.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
-#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-device.h>
 
 #include "saa7164-reg.h"
 #include "saa7164-types.h"
@@ -376,6 +376,7 @@ struct saa7164_port {
        /* Encoder */
        /* Defaults established in saa7164-encoder.c */
        struct saa7164_tvnorm encodernorm;
+       v4l2_std_id std;
        u32 height;
        u32 width;
        u32 freq;
@@ -427,6 +428,8 @@ struct saa7164_dev {
        struct list_head        devlist;
        atomic_t                refcount;
 
+       struct v4l2_device v4l2_dev;
+
        /* pci stuff */
        struct pci_dev  *pci;
        unsigned char   pci_rev, pci_lat;