i2c: Cleanup the includes of <linux/i2c.h>

[powerpc.git] / drivers / media / video / usbvision / usbvision-cards.c

diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c
index c63048d..51ab265 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-cards.c
+++ b/drivers/media/video/usbvision/usbvision-cards.c
@@ -24,7 +24,6 @@
 
 
 #include <linux/list.h>
-#include <linux/i2c.h>
 #include <media/v4l2-dev.h>
 #include <media/tuner.h>
 #include "usbvision.h"
@@ -32,23 +31,6 @@
 
 /* Supported Devices: A table for usbvision.c*/
 struct usbvision_device_data_st  usbvision_device_data[] = {
-       [DUMMY_DEVICE] = {
-               .Interface     = -1,
-               .Codec         = CODEC_SAA7111,
-               .VideoChannels = 3,
-               .VideoNorm     = V4L2_STD_NTSC,
-               .AudioChannels = 1,
-               .Radio         = 1,
-               .vbi           = 1,
-               .Tuner         = 1,
-               .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
-               .X_Offset      = -1,
-               .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
-               .ModelString   = "Custom Dummy USBVision Device",
-       },
        [XANBOO] = {
                .Interface     = -1,
                .Codec         = CODEC_SAA7113,
@@ -59,11 +41,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Xanboo",
        },
        [BELKIN_VIDEOBUS_II] = {
@@ -76,10 +55,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Belkin USB VideoBus II Adapter",
        },
@@ -93,11 +71,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Belkin Components USB VideoBus",
        },
        [BELKIN_USB_VIDEOBUS_II] = {
@@ -110,10 +85,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Belkin USB VideoBus II",
        },
@@ -127,10 +101,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "echoFX InterView Lite",
        },
@@ -144,11 +117,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "USBGear USBG-V1 resp. HAMA USB",
        },
        [D_LINK_V100] = {
@@ -161,10 +131,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "D-Link V100",
        },
@@ -178,11 +147,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "X10 USB Camera",
        },
        [HPG_WINTV_LIVE_PAL_BG] = {
@@ -195,10 +161,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Live (PAL B/G)",
        },
@@ -212,10 +177,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Live Pro (NTSC M/N)",
        },
@@ -229,10 +193,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Zoran Co. PMD (Nogatech) AV-grabber Manhattan",
        },
@@ -246,11 +209,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = 20,
-               .Dvi_yuv       = -1,
                .ModelString   = "Nogatech USB-TV (NTSC) FM",
        },
        [PNY_USB_TV_NTSC_FM] = {
@@ -263,11 +223,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = 20,
-               .Dvi_yuv       = -1,
                .ModelString   = "PNY USB-TV (NTSC) FM",
        },
        [PV_PLAYTV_USB_PRO_PAL_FM] = {
@@ -280,10 +237,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "PixelView PlayTv-USB PRO (PAL) FM",
        },
@@ -297,10 +253,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "ZTV ZT-721 2.4GHz USB A/V Receiver",
        },
@@ -314,11 +269,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = 20,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (NTSC M/N)",
        },
        [HPG_WINTV_PAL_BG] = {
@@ -331,11 +283,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (PAL B/G)",
        },
        [HPG_WINTV_PAL_I] = {
@@ -348,11 +297,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (PAL I)",
        },
        [HPG_WINTV_PAL_SECAM_L] = {
@@ -365,11 +311,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_SECAM,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (PAL/SECAM L)",
        },
        [HPG_WINTV_PAL_D_K] = {
@@ -382,11 +325,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (PAL D/K)",
        },
        [HPG_WINTV_NTSC_FM] = {
@@ -399,11 +339,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (NTSC FM)",
        },
        [HPG_WINTV_PAL_BG_FM] = {
@@ -416,11 +353,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (PAL B/G FM)",
        },
        [HPG_WINTV_PAL_I_FM] = {
@@ -433,11 +367,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (PAL I FM)",
        },
        [HPG_WINTV_PAL_D_K_FM] = {
@@ -450,11 +381,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTV USB (PAL D/K FM)",
        },
        [HPG_WINTV_PRO_NTSC_MN] = {
@@ -467,10 +395,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_MICROTUNE_4049FM5,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (NTSC M/N)",
        },
@@ -484,10 +411,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_MICROTUNE_4049FM5,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (NTSC M/N) V2",
        },
@@ -501,10 +427,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_FM1216ME_MK3,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL/SECAM B/G/I/D/K/L)",
        },
@@ -518,10 +443,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (NTSC M/N) V3",
        },
@@ -535,10 +459,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL B/G)",
        },
@@ -552,10 +475,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL I)",
        },
@@ -569,10 +491,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_SECAM,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL/SECAM L)",
        },
@@ -586,10 +507,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL D/K)",
        },
@@ -603,10 +523,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_SECAM,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL/SECAM BGDK/I/L)",
        },
@@ -620,10 +539,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_SECAM,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL/SECAM BGDK/I/L) V2",
        },
@@ -637,10 +555,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_ALPS_TSBE1_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL B/G) V2",
        },
@@ -654,10 +571,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_ALPS_TSBE1_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL B/G,D/K)",
        },
@@ -671,10 +587,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL I,D/K)",
        },
@@ -688,10 +603,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (NTSC M/N FM)",
        },
@@ -705,10 +619,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL B/G FM)",
        },
@@ -722,10 +635,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL I FM)",
        },
@@ -739,10 +651,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL D/K FM)",
        },
@@ -756,10 +667,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_MICROTUNE_4049FM5,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (Temic PAL/SECAM B/G/I/D/K/L FM)",
        },
@@ -773,10 +683,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_MICROTUNE_4049FM5,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (Temic PAL B/G FM)",
        },
@@ -790,10 +699,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_FM1216ME_MK3,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (PAL/SECAM B/G/I/D/K/L FM)",
        },
@@ -807,10 +715,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Hauppauge WinTV USB Pro (NTSC M/N FM) V2",
        },
@@ -824,11 +731,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 5,
                .Y_Offset      = 5,
-               .Dvi_yuv       = -1,
                .ModelString   = "Camtel Technology USB TV Genie Pro FM Model TVB330",
        },
        [DIGITAL_VIDEO_CREATOR_I] = {
@@ -841,10 +745,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Digital Video Creator I",
        },
@@ -858,10 +761,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 82,
                .Y_Offset      = 20,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Global Village GV-007 (NTSC)",
        },
@@ -875,10 +777,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Dazzle Fusion Model DVC-50 Rev 1 (NTSC)",
        },
@@ -892,10 +793,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Dazzle Fusion Model DVC-80 Rev 1 (PAL)",
        },
@@ -909,10 +809,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Dazzle Fusion Model DVC-90 Rev 1 (SECAM)",
        },
@@ -926,10 +825,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_FM1216ME_MK3,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Eskape Labs MyTV2Go",
        },
@@ -943,11 +841,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 0,
                .Tuner         = 1,
                .TunerType     = TUNER_TEMIC_4066FY5_PAL_I,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Pinnacle Studio PCTV USB (PAL)",
        },
        [PINNA_PCTV_USB_SECAM] = {
@@ -960,11 +855,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_SECAM,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Pinnacle Studio PCTV USB (SECAM)",
        },
        [PINNA_PCTV_USB_PAL_FM] = {
@@ -977,11 +869,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 128,
                .Y_Offset      = 23,
-               .Dvi_yuv       = -1,
                .ModelString   = "Pinnacle Studio PCTV USB (PAL) FM",
        },
        [MIRO_PCTV_USB] = {
@@ -994,11 +883,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Miro PCTV USB",
        },
        [PINNA_PCTV_USB_NTSC_FM] = {
@@ -1011,11 +897,8 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Pinnacle Studio PCTV USB (NTSC) FM",
        },
        [PINNA_PCTV_USB_PAL_FM_V2] = {
@@ -1028,10 +911,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_TEMIC_4009FR5_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Pinnacle Studio PCTV USB (PAL) FM V2",
        },
@@ -1045,10 +927,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_TEMIC_4039FR5_NTSC,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Pinnacle Studio PCTV USB (NTSC) FM V2",
        },
@@ -1062,10 +943,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_TEMIC_4009FR5_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Pinnacle Studio PCTV USB (PAL) FM V3",
        },
@@ -1079,10 +959,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Pinnacle Studio Linx Video input cable (NTSC)",
        },
@@ -1096,10 +975,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 0,
                .TunerType     = 0,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Pinnacle Studio Linx Video input cable (PAL)",
        },
@@ -1113,10 +991,9 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_TEMIC_4009FR5_PAL,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = 0,
                .Y_Offset      = 3,
+               .Dvi_yuv_override = 1,
                .Dvi_yuv       = 7,
                .ModelString   = "Pinnacle PCTV Bungee USB (PAL) FM",
        },
@@ -1130,20 +1007,16 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .vbi           = 1,
                .Tuner         = 1,
                .TunerType     = TUNER_PHILIPS_NTSC_M,
-               .Vin_Reg1      = -1,
-               .Vin_Reg2      = -1,
                .X_Offset      = -1,
                .Y_Offset      = -1,
-               .Dvi_yuv       = -1,
                .ModelString   = "Hauppauge WinTv-USB",
        },
-       {}  /* Terminating entry */
 };
+const int usbvision_device_data_size=ARRAY_SIZE(usbvision_device_data);
 
 /* Supported Devices */
 
 struct usb_device_id usbvision_table [] = {
-       { USB_DEVICE(0xfff0, 0xfff0), .driver_info=DUMMY_DEVICE },
        { USB_DEVICE(0x0a6f, 0x0400), .driver_info=XANBOO },
        { USB_DEVICE(0x050d, 0x0106), .driver_info=BELKIN_VIDEOBUS_II },
        { USB_DEVICE(0x050d, 0x0207), .driver_info=BELKIN_VIDEOBUS },
@@ -1208,8 +1081,6 @@ struct usb_device_id usbvision_table [] = {
        { USB_DEVICE(0x2304, 0x0301), .driver_info=PINNA_LINX_VD_IN_CAB_PAL },
        { USB_DEVICE(0x2304, 0x0419), .driver_info=PINNA_PCTV_BUNGEE_PAL_FM },
        { USB_DEVICE(0x2400, 0x4200), .driver_info=HPG_WINTV },
-
-       { }  /* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE (usb, usbvision_table);