summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-08 19:16:05 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-08 19:16:05 -0200
commita015d228d3c58d1377600c5a06914a06e4e6be36 (patch)
tree9ace55de90ba1021709e4815b709ef902074eb17 /linux/Documentation
parent13500b89ca7818b9e7259d2451069557fd5ec25d (diff)
parentdc1b57bb7e3d558107e4706599fa76dcb3165977 (diff)
downloadmediapointer-dvb-s2-a015d228d3c58d1377600c5a06914a06e4e6be36.tar.gz
mediapointer-dvb-s2-a015d228d3c58d1377600c5a06914a06e4e6be36.tar.bz2
merge: http://linuxtv.org/hg/~dougsland/850-v4l/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
-rw-r--r--linux/Documentation/video4linux/CARDLIST.em28xx3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.em28xx b/linux/Documentation/video4linux/CARDLIST.em28xx
index ea537f5ae..a6734eb7b 100644
--- a/linux/Documentation/video4linux/CARDLIST.em28xx
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx
@@ -14,7 +14,7 @@
13 -> Terratec Prodigy XS (em2880) [0ccd:0047]
14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840) [eb1a:2821]
15 -> V-Gear PocketTV (em2800)
- 16 -> Hauppauge WinTV HVR 950 (em2883) [2040:6513,2040:6517,2040:651b,2040:651f]
+ 16 -> Hauppauge WinTV HVR 950 (em2883) [2040:6513,2040:6517,2040:651b]
17 -> Pinnacle PCTV HD Pro Stick (em2880) [2304:0227]
18 -> Hauppauge WinTV HVR 900 (R2) (em2880) [2040:6502]
19 -> PointNix Intra-Oral Camera (em2860)
@@ -58,3 +58,4 @@
57 -> Kworld PlusTV HD Hybrid 330 (em2883) [eb1a:a316]
58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
59 -> Pinnacle PCTV HD Mini (em2874) [2304:023f]
+ 60 -> Hauppauge WinTV HVR 850 (em2883) [2040:651f]