summaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux
diff options
context:
space:
mode:
authorMarkus Rechberger <mrechberger@gmail.com>2005-11-09 06:38:05 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 16:56:23 +0100
commit08eca13dc407c389f04ce295144bb3fcd996a10d (patch)
tree5641a340debffad85f0f82bef480bc413c26dd3e /Documentation/video4linux
parent[PATCH] v4l: 834: add card pctv cardbus tv radio ito25 rev 2b (diff)
downloadlinux-08eca13dc407c389f04ce295144bb3fcd996a10d.tar.xz
linux-08eca13dc407c389f04ce295144bb3fcd996a10d.zip
[PATCH] v4l: 838: modified settings for msi vox usb 2.0
- Modified settings for MSI VOX USB 2.0 Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index d86aae09450b..4fa58de4b860 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -1,9 +1,9 @@
0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
- 1 -> Unknown EM2820/2840 video grabber (em2820/em2840) [eb1a:2820]
+ 1 -> Unknown EM2820/2840 video grabber (em2820/em2840)
2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]
3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]
4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200]
- 5 -> MSI VOX USB 2.0 (em2820/em2840)
+ 5 -> MSI VOX USB 2.0 (em2820/em2840) [eb1a:2820]
6 -> Terratec Cinergy 200 USB (em2800)
7 -> Leadtek Winfast USB II (em2800)
8 -> Kworld USB2800 (em2800)