aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/gspca.txt5
-rw-r--r--drivers/media/video/gspca/sonixj.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index e418a8fb9c66..fd07d331f4ec 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -266,6 +266,11 @@ sonixj 0c45:60ec SN9C105+MO4000
266sonixj 0c45:60fb Surfer NoName 266sonixj 0c45:60fb Surfer NoName
267sonixj 0c45:60fc LG-LIC300 267sonixj 0c45:60fc LG-LIC300
268sonixj 0c45:60fe Microdia Audio 268sonixj 0c45:60fe Microdia Audio
269sonixj 0c45:6100 PC Camera (SN9C128)
270sonixj 0c45:610a PC Camera (SN9C128)
271sonixj 0c45:610b PC Camera (SN9C128)
272sonixj 0c45:610c PC Camera (SN9C128)
273sonixj 0c45:610e PC Camera (SN9C128)
269sonixj 0c45:6128 Microdia/Sonix SNP325 274sonixj 0c45:6128 Microdia/Sonix SNP325
270sonixj 0c45:612a Avant Camera 275sonixj 0c45:612a Avant Camera
271sonixj 0c45:612c Typhoon Rasy Cam 1.3MPix 276sonixj 0c45:612c Typhoon Rasy Cam 1.3MPix
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 3f8a73e0aca9..77be80d18a78 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -2209,7 +2209,12 @@ static const __devinitdata struct usb_device_id device_table[] = {
2209#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE 2209#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
2210 {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x21)}, 2210 {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x21)},
2211#endif 2211#endif
2212 {USB_DEVICE(0x0c45, 0x6100), BSI(SN9C120, MI0360, 0x5d)}, /*sn9c128*/
2212/* {USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */ 2213/* {USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */
2214 {USB_DEVICE(0x0c45, 0x610a), BSI(SN9C120, OV7648, 0x21)}, /*sn9c128*/
2215 {USB_DEVICE(0x0c45, 0x610b), BSI(SN9C120, OV7660, 0x21)}, /*sn9c128*/
2216 {USB_DEVICE(0x0c45, 0x610c), BSI(SN9C120, HV7131R, 0x11)}, /*sn9c128*/
2217 {USB_DEVICE(0x0c45, 0x610e), BSI(SN9C120, OV7630, 0x21)}, /*sn9c128*/
2213/* {USB_DEVICE(0x0c45, 0x6122), BSI(SN9C110, ICM105C, 0x??)}, */ 2218/* {USB_DEVICE(0x0c45, 0x6122), BSI(SN9C110, ICM105C, 0x??)}, */
2214/* {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */ 2219/* {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */
2215 {USB_DEVICE(0x0c45, 0x6128), BSI(SN9C110, OM6802, 0x21)}, /*sn9c325?*/ 2220 {USB_DEVICE(0x0c45, 0x6128), BSI(SN9C110, OM6802, 0x21)}, /*sn9c325?*/