diff options
Diffstat (limited to 'drivers/media/video/usbvision/usbvision.h')
-rw-r--r-- | drivers/media/video/usbvision/usbvision.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h index ef83a5c4d2fd..f304e66b03a6 100644 --- a/drivers/media/video/usbvision/usbvision.h +++ b/drivers/media/video/usbvision/usbvision.h | |||
@@ -319,8 +319,6 @@ struct usbvision_frame { | |||
319 | #define BRIDGE_NT1004 1004 | 319 | #define BRIDGE_NT1004 1004 |
320 | #define BRIDGE_NT1005 1005 | 320 | #define BRIDGE_NT1005 1005 |
321 | 321 | ||
322 | #define USBVISION_I2C_CLIENTS_MAX 8 | ||
323 | |||
324 | struct usbvision_device_data_st { | 322 | struct usbvision_device_data_st { |
325 | int idVendor; | 323 | int idVendor; |
326 | int idProduct; | 324 | int idProduct; |
@@ -355,8 +353,6 @@ struct usb_usbvision { | |||
355 | struct i2c_adapter i2c_adap; | 353 | struct i2c_adapter i2c_adap; |
356 | struct i2c_algo_usb_data i2c_algo; | 354 | struct i2c_algo_usb_data i2c_algo; |
357 | struct i2c_client i2c_client; | 355 | struct i2c_client i2c_client; |
358 | int i2c_state, i2c_ok; | ||
359 | struct i2c_client *i2c_clients[USBVISION_I2C_CLIENTS_MAX]; | ||
360 | 356 | ||
361 | struct urb *ctrlUrb; | 357 | struct urb *ctrlUrb; |
362 | unsigned char ctrlUrbBuffer[8]; | 358 | unsigned char ctrlUrbBuffer[8]; |
@@ -367,6 +363,7 @@ struct usb_usbvision { | |||
367 | 363 | ||
368 | int have_tuner; | 364 | int have_tuner; |
369 | int tuner_type; | 365 | int tuner_type; |
366 | int tuner_addr; | ||
370 | int bridgeType; // NT1003, NT1004, NT1005 | 367 | int bridgeType; // NT1003, NT1004, NT1005 |
371 | int channel; | 368 | int channel; |
372 | int radio; | 369 | int radio; |