diff options
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 2 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_devtable.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 72f830a6572c..85e4e6a360cc 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -3207,10 +3207,8 @@ static const __devinitdata struct usb_device_id device_table[] = { | |||
3207 | {USB_DEVICE(0x0c45, 0x612c), BS(SN9C110, MO4000)}, | 3207 | {USB_DEVICE(0x0c45, 0x612c), BS(SN9C110, MO4000)}, |
3208 | {USB_DEVICE(0x0c45, 0x612e), BS(SN9C110, OV7630)}, | 3208 | {USB_DEVICE(0x0c45, 0x612e), BS(SN9C110, OV7630)}, |
3209 | /* {USB_DEVICE(0x0c45, 0x612f), BS(SN9C110, ICM105C)}, */ | 3209 | /* {USB_DEVICE(0x0c45, 0x612f), BS(SN9C110, ICM105C)}, */ |
3210 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE | ||
3211 | {USB_DEVICE(0x0c45, 0x6130), BS(SN9C120, MI0360)}, | 3210 | {USB_DEVICE(0x0c45, 0x6130), BS(SN9C120, MI0360)}, |
3212 | /* or MT9V111 / MI0360B */ | 3211 | /* or MT9V111 / MI0360B */ |
3213 | #endif | ||
3214 | /* {USB_DEVICE(0x0c45, 0x6132), BS(SN9C120, OV7670)}, */ | 3212 | /* {USB_DEVICE(0x0c45, 0x6132), BS(SN9C120, OV7670)}, */ |
3215 | {USB_DEVICE(0x0c45, 0x6138), BS(SN9C120, MO4000)}, | 3213 | {USB_DEVICE(0x0c45, 0x6138), BS(SN9C120, MO4000)}, |
3216 | {USB_DEVICE(0x0c45, 0x613a), BS(SN9C120, OV7648)}, | 3214 | {USB_DEVICE(0x0c45, 0x613a), BS(SN9C120, OV7648)}, |
diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h index 62ee1f035d6b..ccfa59c54552 100644 --- a/drivers/media/video/sn9c102/sn9c102_devtable.h +++ b/drivers/media/video/sn9c102/sn9c102_devtable.h | |||
@@ -121,7 +121,9 @@ static const struct usb_device_id sn9c102_id_table[] = { | |||
121 | #endif | 121 | #endif |
122 | { SN9C102_USB_DEVICE(0x0c45, 0x6108, BRIDGE_SN9C120), }, | 122 | { SN9C102_USB_DEVICE(0x0c45, 0x6108, BRIDGE_SN9C120), }, |
123 | { SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), }, | 123 | { SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), }, |
124 | #if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE | ||
124 | { SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), }, | 125 | { SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), }, |
126 | #endif | ||
125 | /* { SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */ | 127 | /* { SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */ |
126 | #if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE | 128 | #if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE |
127 | { SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), }, | 129 | { SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), }, |