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

[kvmfornfv.git] / kernel / drivers / media / pci / tw68 / tw68.h

diff --git a/kernel/drivers/media/pci/tw68/tw68.h b/kernel/drivers/media/pci/tw68/tw68.h
index 93f2335..6c7dcb3 100644 (file)
--- a/kernel/drivers/media/pci/tw68/tw68.h
+++ b/kernel/drivers/media/pci/tw68/tw68.h
@@ -36,28 +36,13 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-sg.h>
 
 #include "tw68-reg.h"
 
 #define        UNSET   (-1U)
 
-/* system vendor and device ID's */
-#define        PCI_VENDOR_ID_TECHWELL  0x1797
-#define        PCI_DEVICE_ID_6800      0x6800
-#define        PCI_DEVICE_ID_6801      0x6801
-#define        PCI_DEVICE_ID_AUDIO2    0x6802
-#define        PCI_DEVICE_ID_TS3       0x6803
-#define        PCI_DEVICE_ID_6804      0x6804
-#define        PCI_DEVICE_ID_AUDIO5    0x6805
-#define        PCI_DEVICE_ID_TS6       0x6806
-
-/* tw6816 based cards */
-#define        PCI_DEVICE_ID_6816_1   0x6810
-#define        PCI_DEVICE_ID_6816_2   0x6811
-#define        PCI_DEVICE_ID_6816_3   0x6812
-#define        PCI_DEVICE_ID_6816_4   0x6813
-
 #define TW68_NORMS ( \
        V4L2_STD_NTSC    | V4L2_STD_PAL       | V4L2_STD_SECAM    | \
        V4L2_STD_PAL_M   | V4L2_STD_PAL_Nc    | V4L2_STD_PAL_60)
@@ -134,7 +119,7 @@ struct tw68_dev;    /* forward delclaration */
 
 /* buffer for one video/vbi/ts frame */
 struct tw68_buf {
-       struct vb2_buffer vb;
+       struct vb2_v4l2_buffer vb;
        struct list_head list;
 
        unsigned int   size;