aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sonixb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/sonixb.c')
-rw-r--r--drivers/media/video/gspca/sonixb.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 602608031247..f30e6ec91375 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -1153,7 +1153,7 @@ static const struct sd_desc sd_desc = {
1153#define NO_BRIGHTNESS (1 << BRIGHTNESS_IDX) 1153#define NO_BRIGHTNESS (1 << BRIGHTNESS_IDX)
1154 1154
1155static __devinitdata struct usb_device_id device_table[] = { 1155static __devinitdata struct usb_device_id device_table[] = {
1156#ifndef CONFIG_USB_SN9C102 1156#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
1157 {USB_DEVICE(0x0c45, 0x6001), /* SN9C102 */ 1157 {USB_DEVICE(0x0c45, 0x6001), /* SN9C102 */
1158 SFCI(TAS5110, F_GAIN|F_SIF, NO_BRIGHTNESS|NO_FREQ, 0)}, 1158 SFCI(TAS5110, F_GAIN|F_SIF, NO_BRIGHTNESS|NO_FREQ, 0)},
1159 {USB_DEVICE(0x0c45, 0x6005), /* SN9C101 */ 1159 {USB_DEVICE(0x0c45, 0x6005), /* SN9C101 */
@@ -1167,7 +1167,7 @@ static __devinitdata struct usb_device_id device_table[] = {
1167#endif 1167#endif
1168 {USB_DEVICE(0x0c45, 0x6011), /* SN9C101 - SN9C101G */ 1168 {USB_DEVICE(0x0c45, 0x6011), /* SN9C101 - SN9C101G */
1169 SFCI(OV6650, F_GAIN|F_SIF, 0, 0x60)}, 1169 SFCI(OV6650, F_GAIN|F_SIF, 0, 0x60)},
1170#ifndef CONFIG_USB_SN9C102 1170#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
1171 {USB_DEVICE(0x0c45, 0x6019), /* SN9C101 */ 1171 {USB_DEVICE(0x0c45, 0x6019), /* SN9C101 */
1172 SFCI(OV7630, F_GAIN, 0, 0x21)}, 1172 SFCI(OV7630, F_GAIN, 0, 0x21)},
1173 {USB_DEVICE(0x0c45, 0x6024), /* SN9C102 */ 1173 {USB_DEVICE(0x0c45, 0x6024), /* SN9C102 */
@@ -1180,10 +1180,14 @@ static __devinitdata struct usb_device_id device_table[] = {
1180 SFCI(PAS106, F_SIF, NO_EXPO|NO_FREQ, 0)}, 1180 SFCI(PAS106, F_SIF, NO_EXPO|NO_FREQ, 0)},
1181 {USB_DEVICE(0x0c45, 0x602c), /* SN9C102 */ 1181 {USB_DEVICE(0x0c45, 0x602c), /* SN9C102 */
1182 SFCI(OV7630, F_GAIN, 0, 0x21)}, 1182 SFCI(OV7630, F_GAIN, 0, 0x21)},
1183#endif
1183 {USB_DEVICE(0x0c45, 0x602d), /* SN9C102 */ 1184 {USB_DEVICE(0x0c45, 0x602d), /* SN9C102 */
1184 SFCI(HV7131R, 0, NO_EXPO|NO_FREQ, 0)}, 1185 SFCI(HV7131R, 0, NO_EXPO|NO_FREQ, 0)},
1186#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
1185 {USB_DEVICE(0x0c45, 0x602e), /* SN9C102 */ 1187 {USB_DEVICE(0x0c45, 0x602e), /* SN9C102 */
1186 SFCI(OV7630, F_GAIN, 0, 0x21)}, 1188 SFCI(OV7630, F_GAIN, 0, 0x21)},
1189 {USB_DEVICE(0x0c45, 0x608f), /* SN9C103 */
1190 SFCI(OV7630, F_GAIN|F_H18, 0, 0x21)},
1187 {USB_DEVICE(0x0c45, 0x60af), /* SN9C103 */ 1191 {USB_DEVICE(0x0c45, 0x60af), /* SN9C103 */
1188 SFCI(PAS202, F_H18, NO_EXPO|NO_FREQ, 0)}, 1192 SFCI(PAS202, F_H18, NO_EXPO|NO_FREQ, 0)},
1189 {USB_DEVICE(0x0c45, 0x60b0), /* SN9C103 */ 1193 {USB_DEVICE(0x0c45, 0x60b0), /* SN9C103 */