Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[pandora-kernel.git] / Documentation / video4linux / gspca.txt

diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 1800a62..181b9e6 100644 (file)
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -42,6 +42,7 @@ ov519         041e:4064       Creative Live! VISTA VF0420
 ov519          041e:4067       Creative Live! Cam Video IM (VF0350)
 ov519          041e:4068       Creative Live! VISTA VF0470
 spca561                0458:7004       Genius VideoCAM Express V2
+sn9c2028       0458:7005       Genius Smart 300, version 2
 sunplus                0458:7006       Genius Dsc 1.3 Smart
 zc3xx          0458:7007       Genius VideoCam V2
 zc3xx          0458:700c       Genius VideoCam V3
@@ -109,6 +110,7 @@ sunplus             04a5:3003       Benq DC 1300
 sunplus                04a5:3008       Benq DC 1500
 sunplus                04a5:300a       Benq DC 3410
 spca500                04a5:300c       Benq DC 1016
+benq           04a5:3035       Benq DC E300
 finepix                04cb:0104       Fujifilm FinePix 4800
 finepix                04cb:0109       Fujifilm FinePix A202
 finepix                04cb:010b       Fujifilm FinePix A203
@@ -142,6 +144,7 @@ sunplus             04fc:5360       Sunplus Generic
 spca500                04fc:7333       PalmPixDC85
 sunplus                04fc:ffff       Pure DigitalDakota
 spca501                0506:00df       3Com HomeConnect Lite
+sunplus                052b:1507       Megapixel 5 Pretec DC-1007
 sunplus                052b:1513       Megapix V4
 sunplus                052b:1803       MegaImage VI
 tv8532         0545:808b       Veo Stingray
@@ -151,6 +154,7 @@ sunplus             0546:3191       Polaroid Ion 80
 sunplus                0546:3273       Polaroid PDC2030
 ov519          054c:0154       Sonny toy4
 ov519          054c:0155       Sonny toy5
+cpia1          0553:0002       CPIA CPiA (version1) based cameras
 zc3xx          055f:c005       Mustek Wcam300A
 spca500                055f:c200       Mustek Gsmart 300
 sunplus                055f:c211       Kowa Bs888e Microcamera
@@ -188,8 +192,7 @@ spca500             06bd:0404       Agfa CL20
 spca500                06be:0800       Optimedia
 sunplus                06d6:0031       Trust 610 LCD PowerC@m Zoom
 spca506                06e1:a190       ADS Instant VCD
-ov534          06f8:3002       Hercules Blog Webcam
-ov534          06f8:3003       Hercules Dualpix HD Weblog
+ov534_9                06f8:3003       Hercules Dualpix HD Weblog
 sonixj         06f8:3004       Hercules Classic Silver
 sonixj         06f8:3008       Hercules Deluxe Optical Glass
 pac7302                06f8:3009       Hercules Classic Link
@@ -204,6 +207,7 @@ sunplus             0733:2221       Mercury Digital Pro 3.1p
 sunplus                0733:3261       Concord 3045 spca536a
 sunplus                0733:3281       Cyberpix S550V
 spca506                0734:043b       3DeMon USB Capture aka
+cpia1          0813:0001       QX3 camera
 ov519          0813:0002       Dual Mode USB Camera Plus
 spca500                084d:0003       D-Link DSC-350
 spca500                08ca:0103       Aiptek PocketDV
@@ -225,7 +229,8 @@ sunplus             08ca:2050       Medion MD 41437
 sunplus                08ca:2060       Aiptek PocketDV5300
 tv8532         0923:010f       ICM532 cams
 mars           093a:050f       Mars-Semi Pc-Camera
-mr97310a       093a:010f       Sakar Digital no. 77379
+mr97310a       093a:010e       All known CIF cams with this ID
+mr97310a       093a:010f       All known VGA cams with this ID
 pac207         093a:2460       Qtec Webcam 100
 pac207         093a:2461       HP Webcam
 pac207         093a:2463       Philips SPC 220 NC
@@ -302,6 +307,7 @@ sonixj              0c45:613b       Surfer SN-206
 sonixj         0c45:613c       Sonix Pccam168
 sonixj         0c45:6143       Sonix Pccam168
 sonixj         0c45:6148       Digitus DA-70811/ZSMC USB PC Camera ZS211/Microdia
+sonixj         0c45:614a       Frontech E-Ccam (JIL-2225)
 sn9c20x                0c45:6240       PC Camera (SN9C201 + MT9M001)
 sn9c20x                0c45:6242       PC Camera (SN9C201 + MT9M111)
 sn9c20x                0c45:6248       PC Camera (SN9C201 + OV9655)
@@ -324,6 +330,10 @@ sn9c20x            0c45:62b0       PC Camera (SN9C202 + MT9V011/MT9V111/MT9V112)
 sn9c20x                0c45:62b3       PC Camera (SN9C202 + OV9655)
 sn9c20x                0c45:62bb       PC Camera (SN9C202 + OV7660)
 sn9c20x                0c45:62bc       PC Camera (SN9C202 + HV7131R)
+sn9c2028       0c45:8001       Wild Planet Digital Spy Camera
+sn9c2028       0c45:8003       Sakar #11199, #6637x, #67480 keychain cams
+sn9c2028       0c45:8008       Mini-Shotz ms-350
+sn9c2028       0c45:800a       Vivitar Vivicam 3350B
 sunplus                0d64:0303       Sunplus FashionCam DXG
 ov519          0e96:c001       TRUST 380 USB2 SPACEC@M
 etoms          102c:6151       Qcam Sangha CIF
@@ -341,10 +351,11 @@ spca501           1776:501c       Arowana 300K CMOS Camera
 t613           17a1:0128       TASCORP JPEG Webcam, NGS Cyclops
 vc032x         17ef:4802       Lenovo Vc0323+MI1310_SOC
 pac207         2001:f115       D-Link DSB-C120
-sq905c         2770:9050       sq905c
-sq905c         2770:905c       DualCamera
-sq905          2770:9120       Argus Digital Camera DC1512
-sq905c         2770:913d       sq905c
+sq905c         2770:9050       Disney pix micro (CIF)
+sq905c         2770:9052       Disney pix micro 2 (VGA)
+sq905c         2770:905c       All 11 known cameras with this ID
+sq905          2770:9120       All 24 known cameras with this ID
+sq905c         2770:913d       All 4 known cameras with this ID
 spca500                2899:012c       Toptro Industrial
 ov519          8020:ef04       ov519
 spca508                8086:0110       Intel Easy PC Camera