summaryrefslogtreecommitdiff
path: root/linux/Documentation/video4linux/CARDLIST.em28xx
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-09-25 08:37:12 -0400
committerMichael Krufky <mkrufky@linuxtv.org>2008-09-25 08:37:12 -0400
commit7e39de54b4ed06bb2ababbe72b16f195d796d8f0 (patch)
tree5a74da414f5b1aaa78712988a989a00a94736648 /linux/Documentation/video4linux/CARDLIST.em28xx
parent968c43076f37c9f65df65fe50a1c643a82b1192b (diff)
parent9385e4874ef72f62d77800fe2eb47429d0854125 (diff)
downloadmediapointer-dvb-s2-7e39de54b4ed06bb2ababbe72b16f195d796d8f0.tar.gz
mediapointer-dvb-s2-7e39de54b4ed06bb2ababbe72b16f195d796d8f0.tar.bz2
merge: ~pb/v4l-dvb
From: Michael Krufky <mkrufky@linuxtv.org> Priority: normal Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/Documentation/video4linux/CARDLIST.em28xx')
-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 89c7f32ab..b9181b523 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:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
+ 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2820,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)
+ 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]
17 -> Pinnacle PCTV HD Pro Stick (em2880) [2304:0227]