1 files changed, 19 insertions, 20 deletions

diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index ad6afd3e42a4..bd6f6422ed54 100644
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -342,23 +342,24 @@ struct usbvision_frame {
 #define BRIDGE_NT1005   1005
 
 struct usbvision_device_data_st {
-        int idVendor;
-        int idProduct;
-        int Interface; /* to handle special interface number like BELKIN and Hauppauge WinTV-USB II */
-        int Codec;
-        int VideoChannels;
         __u64 VideoNorm;
-        int AudioChannels;
-        int Radio;
-        int vbi;
-        int Tuner;
-        int TunerType;
-        int Vin_Reg1;
-        int Vin_Reg2;
-        int X_Offset;
-        int Y_Offset;
-        int Dvi_yuv;
-        char *ModelString;
+        const char *ModelString;
+        int Interface; /* to handle special interface number like BELKIN and Hauppauge WinTV-USB II */
+        __u16 Codec;
+        unsigned VideoChannels:3;
+        unsigned AudioChannels:2;
+        unsigned Radio:1;
+        unsigned vbi:1;
+        unsigned Tuner:1;
+        unsigned Vin_Reg1_override:1;   /* Override default value with */
+        unsigned Vin_Reg2_override:1;   /* Vin_Reg1, Vin_Reg2, etc. */
+        unsigned Dvi_yuv_override:1;
+        __u8 Vin_Reg1;
+        __u8 Vin_Reg2;
+        __u8 Dvi_yuv;
+        __u8 TunerType;
+        __s16 X_Offset;
+        __s16 Y_Offset;
 };
 
 /* Declared on usbvision-cards.c */
@@ -481,13 +482,11 @@ struct usb_usbvision {
 /* i2c-algo-usb declaration                                        */
 /* --------------------------------------------------------------- */
 
-int usbvision_i2c_usb_del_bus(struct i2c_adapter *);
-
-
 /* ----------------------------------------------------------------------- */
 /* usbvision specific I2C functions                                        */
 /* ----------------------------------------------------------------------- */
-int usbvision_init_i2c(struct usb_usbvision *usbvision);
+int usbvision_i2c_register(struct usb_usbvision *usbvision);
+int usbvision_i2c_unregister(struct usb_usbvision *usbvision);
 void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,void *arg);
 
 /* defined in usbvision-core.c                                      */