diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-14 21:08:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-14 21:08:51 -0300 |
| commit | a0709490f724df6f67b98e9a578bc7bbdcda74b3 (patch) | |
| tree | 8e6746b93baba346a79457f6e69194511ef30fd0 /linux/Documentation/video4linux | |
| parent | 69db135e84d7caa8eaca84fab752a51a644f6b98 (diff) | |
| parent | 780de7a15fcc2833d415c0ddf001647ac3b24df8 (diff) | |
| download | mediapointer-dvb-s2-a0709490f724df6f67b98e9a578bc7bbdcda74b3.tar.gz mediapointer-dvb-s2-a0709490f724df6f67b98e9a578bc7bbdcda74b3.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-cap
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation/video4linux')
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.em28xx | 2 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/gspca.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.em28xx b/linux/Documentation/video4linux/CARDLIST.em28xx index 2c52f7a70..084a7b624 100644 --- a/linux/Documentation/video4linux/CARDLIST.em28xx +++ b/linux/Documentation/video4linux/CARDLIST.em28xx @@ -20,7 +20,7 @@ 19 -> EM2860/SAA711X Reference Design (em2860) 20 -> AMD ATI TV Wonder HD 600 (em2880) [0438:b002] 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800) [eb1a:2801] - 22 -> Unknown EM2750/EM2751 webcam grabber (em2750) [eb1a:2750,eb1a:2751] + 22 -> EM2710/EM2750/EM2751 webcam grabber (em2750) [eb1a:2750,eb1a:2751] 23 -> Huaqi DLCW-130 (em2750) 24 -> D-Link DUB-T210 TV Tuner (em2820/em2840) [2001:f112] 25 -> Gadmei UTV310 (em2820/em2840) diff --git a/linux/Documentation/video4linux/gspca.txt b/linux/Documentation/video4linux/gspca.txt index 2bcf78896..0ec9acd41 100644 --- a/linux/Documentation/video4linux/gspca.txt +++ b/linux/Documentation/video4linux/gspca.txt @@ -233,6 +233,7 @@ pac7311 093a:2621 PAC731x pac7311 093a:2622 Genius Eye 312 pac7311 093a:2624 PAC7302 pac7311 093a:2626 Labtec 2200 +pac7311 093a:2629 Genious iSlim 300 pac7311 093a:262a Webcam 300k pac7311 093a:262c Philips SPC 230 NC zc3xx 0ac8:0302 Z-star Vimicro zc0302 @@ -245,6 +246,7 @@ zc3xx 0ac8:305b Z-star Vimicro zc0305b zc3xx 0ac8:307b Ldlc VC302+Ov7620 vc032x 0ac8:c001 Sony embedded vimicro vc032x 0ac8:c002 Sony embedded vimicro +vc032x 0ac8:c301 Samsung Q1 Ultra Premium spca508 0af9:0010 Hama USB Sightcam 100 spca508 0af9:0011 Hama USB Sightcam 100 sonixb 0c45:6001 Genius VideoCAM NB |