diff options
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r-- | drivers/media/video/gspca/sonixb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c index 64bc758fbae5..5dd78c6766ea 100644 --- a/drivers/media/video/gspca/sonixb.c +++ b/drivers/media/video/gspca/sonixb.c | |||
@@ -348,7 +348,7 @@ static const __u8 initOv7630[] = { | |||
348 | static const __u8 initOv7630_3[] = { | 348 | static const __u8 initOv7630_3[] = { |
349 | 0x44, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0x80, /* r01 .. r08 */ | 349 | 0x44, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0x80, /* r01 .. r08 */ |
350 | 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, /* r09 .. r10 */ | 350 | 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, /* r09 .. r10 */ |
351 | 0x00, 0x01, 0x01, 0x0a, /* r11 .. r14 */ | 351 | 0x00, 0x02, 0x01, 0x0a, /* r11 .. r14 */ |
352 | 0x28, 0x1e, /* H & V sizes r15 .. r16 */ | 352 | 0x28, 0x1e, /* H & V sizes r15 .. r16 */ |
353 | 0x68, 0x8f, MCK_INIT1, /* r17 .. r19 */ | 353 | 0x68, 0x8f, MCK_INIT1, /* r17 .. r19 */ |
354 | 0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c, 0x00, /* r1a .. r20 */ | 354 | 0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c, 0x00, /* r1a .. r20 */ |
@@ -1230,10 +1230,12 @@ static __devinitdata struct usb_device_id device_table[] = { | |||
1230 | {USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)}, | 1230 | {USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)}, |
1231 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE | 1231 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE |
1232 | {USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)}, | 1232 | {USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)}, |
1233 | #endif | ||
1233 | {USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)}, | 1234 | {USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)}, |
1235 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE | ||
1234 | {USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)}, | 1236 | {USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)}, |
1235 | {USB_DEVICE(0x0c45, 0x60b0), SB(OV7630, 103)}, | ||
1236 | #endif | 1237 | #endif |
1238 | {USB_DEVICE(0x0c45, 0x60b0), SB(OV7630, 103)}, | ||
1237 | {} | 1239 | {} |
1238 | }; | 1240 | }; |
1239 | MODULE_DEVICE_TABLE(usb, device_table); | 1241 | MODULE_DEVICE_TABLE(usb, device_table); |