diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 15:24:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 15:24:02 -0400 |
commit | db0a2901a32c44510d7d429358d017143a649a70 (patch) | |
tree | 4e4e41cf2e27aa4940f9c0711ca2a3bf7557a805 /Documentation | |
parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
parent | 4cce1655b26a4df1e619b2aa3d2eea1b7a6e906c (diff) |
Merge branch 'fixes_stg' of ../git_old into fixes
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/video4linux/CARDLIST.au0828 | 1 | ||||
-rw-r--r-- | Documentation/video4linux/gspca.txt | 29 |
2 files changed, 17 insertions, 13 deletions
diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828 index eedc399e8de..aa05e5bb22f 100644 --- a/Documentation/video4linux/CARDLIST.au0828 +++ b/Documentation/video4linux/CARDLIST.au0828 | |||
@@ -3,3 +3,4 @@ | |||
3 | 2 -> Hauppauge HVR850 (au0828) [2040:7240] | 3 | 2 -> Hauppauge HVR850 (au0828) [2040:7240] |
4 | 3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620] | 4 | 3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620] |
5 | 4 -> Hauppauge HVR950Q rev xxF8 (au0828) [2040:7201,2040:7211,2040:7281] | 5 | 4 -> Hauppauge HVR950Q rev xxF8 (au0828) [2040:7201,2040:7211,2040:7281] |
6 | 5 -> Hauppauge Woodbury (au0828) [2040:8200] | ||
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 78a863ab8a5..0f03900c48f 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt | |||
@@ -88,14 +88,14 @@ zc3xx 0471:0325 Philips SPC 200 NC | |||
88 | zc3xx 0471:0326 Philips SPC 300 NC | 88 | zc3xx 0471:0326 Philips SPC 300 NC |
89 | sonixj 0471:0327 Philips SPC 600 NC | 89 | sonixj 0471:0327 Philips SPC 600 NC |
90 | sonixj 0471:0328 Philips SPC 700 NC | 90 | sonixj 0471:0328 Philips SPC 700 NC |
91 | zc3xx 0471:032d Philips spc210nc | 91 | zc3xx 0471:032d Philips SPC 210 NC |
92 | zc3xx 0471:032e Philips spc315nc | 92 | zc3xx 0471:032e Philips SPC 315 NC |
93 | sonixj 0471:0330 Philips SPC 710NC | 93 | sonixj 0471:0330 Philips SPC 710 NC |
94 | spca501 0497:c001 Smile International | 94 | spca501 0497:c001 Smile International |
95 | sunplus 04a5:3003 Benq DC 1300 | 95 | sunplus 04a5:3003 Benq DC 1300 |
96 | sunplus 04a5:3008 Benq DC 1500 | 96 | sunplus 04a5:3008 Benq DC 1500 |
97 | sunplus 04a5:300a Benq DC3410 | 97 | sunplus 04a5:300a Benq DC 3410 |
98 | spca500 04a5:300c Benq DC1016 | 98 | spca500 04a5:300c Benq DC 1016 |
99 | sunplus 04f1:1001 JVC GC A50 | 99 | sunplus 04f1:1001 JVC GC A50 |
100 | spca561 04fc:0561 Flexcam 100 | 100 | spca561 04fc:0561 Flexcam 100 |
101 | sunplus 04fc:500c Sunplus CA500C | 101 | sunplus 04fc:500c Sunplus CA500C |
@@ -175,19 +175,21 @@ sunplus 08ca:2060 Aiptek PocketDV5300 | |||
175 | tv8532 0923:010f ICM532 cams | 175 | tv8532 0923:010f ICM532 cams |
176 | mars 093a:050f Mars-Semi Pc-Camera | 176 | mars 093a:050f Mars-Semi Pc-Camera |
177 | pac207 093a:2460 PAC207 Qtec Webcam 100 | 177 | pac207 093a:2460 PAC207 Qtec Webcam 100 |
178 | pac207 093a:2463 Philips spc200nc pac207 | 178 | pac207 093a:2463 Philips SPC 220 NC |
179 | pac207 093a:2464 Labtec Webcam 1200 | 179 | pac207 093a:2464 Labtec Webcam 1200 |
180 | pac207 093a:2468 PAC207 | 180 | pac207 093a:2468 PAC207 |
181 | pac207 093a:2470 Genius GF112 | 181 | pac207 093a:2470 Genius GF112 |
182 | pac207 093a:2471 PAC207 Genius VideoCam ge111 | 182 | pac207 093a:2471 Genius VideoCam ge111 |
183 | pac207 093a:2472 PAC207 Genius VideoCam ge110 | 183 | pac207 093a:2472 Genius VideoCam ge110 |
184 | pac7311 093a:2600 PAC7311 Typhoon | 184 | pac7311 093a:2600 PAC7311 Typhoon |
185 | pac7311 093a:2601 PAC7311 Phillips SPC610NC | 185 | pac7311 093a:2601 Philips SPC 610 NC |
186 | pac7311 093a:2603 PAC7312 | 186 | pac7311 093a:2603 PAC7312 |
187 | pac7311 093a:2608 PAC7311 Trust WB-3300p | 187 | pac7311 093a:2608 Trust WB-3300p |
188 | pac7311 093a:260e PAC7311 Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350 | 188 | pac7311 093a:260e Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350 |
189 | pac7311 093a:260f PAC7311 SnakeCam | 189 | pac7311 093a:260f SnakeCam |
190 | pac7311 093a:2621 PAC731x | 190 | pac7311 093a:2621 PAC731x |
191 | pac7311 093a:2624 PAC7302 | ||
192 | pac7311 093a:2626 Labtec 2200 | ||
191 | zc3xx 0ac8:0302 Z-star Vimicro zc0302 | 193 | zc3xx 0ac8:0302 Z-star Vimicro zc0302 |
192 | vc032x 0ac8:0321 Vimicro generic vc0321 | 194 | vc032x 0ac8:0321 Vimicro generic vc0321 |
193 | vc032x 0ac8:0323 Vimicro Vc0323 | 195 | vc032x 0ac8:0323 Vimicro Vc0323 |
@@ -220,6 +222,7 @@ sonixj 0c45:60c0 Sangha Sn535 | |||
220 | sonixj 0c45:60ec SN9C105+MO4000 | 222 | sonixj 0c45:60ec SN9C105+MO4000 |
221 | sonixj 0c45:60fb Surfer NoName | 223 | sonixj 0c45:60fb Surfer NoName |
222 | sonixj 0c45:60fc LG-LIC300 | 224 | sonixj 0c45:60fc LG-LIC300 |
225 | sonixj 0c45:6128 Microdia/Sonix SNP325 | ||
223 | sonixj 0c45:612a Avant Camera | 226 | sonixj 0c45:612a Avant Camera |
224 | sonixj 0c45:612c Typhoon Rasy Cam 1.3MPix | 227 | sonixj 0c45:612c Typhoon Rasy Cam 1.3MPix |
225 | sonixj 0c45:6130 Sonix Pccam | 228 | sonixj 0c45:6130 Sonix Pccam |
@@ -234,7 +237,7 @@ zc3xx 10fd:0128 Typhoon Webshot II USB 300k 0x0128 | |||
234 | spca561 10fd:7e50 FlyCam Usb 100 | 237 | spca561 10fd:7e50 FlyCam Usb 100 |
235 | zc3xx 10fd:8050 Typhoon Webshot II USB 300k | 238 | zc3xx 10fd:8050 Typhoon Webshot II USB 300k |
236 | spca501 1776:501c Arowana 300K CMOS Camera | 239 | spca501 1776:501c Arowana 300K CMOS Camera |
237 | t613 17a1:0128 T613/TAS5130A | 240 | t613 17a1:0128 TASCORP JPEG Webcam, NGS Cyclops |
238 | vc032x 17ef:4802 Lenovo Vc0323+MI1310_SOC | 241 | vc032x 17ef:4802 Lenovo Vc0323+MI1310_SOC |
239 | pac207 2001:f115 D-Link DSB-C120 | 242 | pac207 2001:f115 D-Link DSB-C120 |
240 | spca500 2899:012c Toptro Industrial | 243 | spca500 2899:012c Toptro Industrial |