summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-12-19 11:22:19 +0100
committerJean-Francois Moine <moinejf@free.fr>2008-12-19 11:22:19 +0100
commitc1687736b4c359f8963683698ad5cf33e6d7780e (patch)
treeb062c72c9853bcca3f4849647519cb5a0a82caee /linux/Documentation
parenteebdebc91edbad9e91a7ac0b8762b12fd4160b0b (diff)
parentc4542dc81f4ce29264cfdf0ac973a51129685567 (diff)
downloadmediapointer-dvb-s2-c1687736b4c359f8963683698ad5cf33e6d7780e.tar.gz
mediapointer-dvb-s2-c1687736b4c359f8963683698ad5cf33e6d7780e.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/Documentation')
-rw-r--r--linux/Documentation/video4linux/CARDLIST.em28xx4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.em28xx b/linux/Documentation/video4linux/CARDLIST.em28xx
index a6734eb7b..0c4c721da 100644
--- a/linux/Documentation/video4linux/CARDLIST.em28xx
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx
@@ -1,5 +1,5 @@
0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
- 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2820,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
+ 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
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,2040:4201]
@@ -12,7 +12,7 @@
11 -> Terratec Hybrid XS (em2880) [0ccd:0042]
12 -> Kworld PVR TV 2800 RF (em2820/em2840)
13 -> Terratec Prodigy XS (em2880) [0ccd:0047]
- 14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840) [eb1a:2821]
+ 14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840)
15 -> V-Gear PocketTV (em2800)
16 -> Hauppauge WinTV HVR 950 (em2883) [2040:6513,2040:6517,2040:651b]
17 -> Pinnacle PCTV HD Pro Stick (em2880) [2304:0227]