summaryrefslogtreecommitdiff
path: root/linux/Documentation/video4linux/CARDLIST.em28xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-14 10:22:13 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-14 10:22:13 -0200
commit7c14ddab23ce558c7d5de6fc23dddd36354bc55d (patch)
tree7515d832b81620dda128f6958cae51bb65e80c7e /linux/Documentation/video4linux/CARDLIST.em28xx
parentfa4573d8426537fc6e799fc561c4b371a494f829 (diff)
parent3074f9b68fb34b45932e9bb550a5234693eb6e04 (diff)
downloadmediapointer-dvb-s2-7c14ddab23ce558c7d5de6fc23dddd36354bc55d.tar.gz
mediapointer-dvb-s2-7c14ddab23ce558c7d5de6fc23dddd36354bc55d.tar.bz2
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/Documentation/video4linux/CARDLIST.em28xx')
-rw-r--r--linux/Documentation/video4linux/CARDLIST.em28xx2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.em28xx b/linux/Documentation/video4linux/CARDLIST.em28xx
index dbc19ca9e..6a8469f2b 100644
--- a/linux/Documentation/video4linux/CARDLIST.em28xx
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx
@@ -2,7 +2,7 @@
1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2750,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]
+ 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]
5 -> MSI VOX USB 2.0 (em2820/em2840)
6 -> Terratec Cinergy 200 USB (em2800)
7 -> Leadtek Winfast USB II (em2800)