summaryrefslogtreecommitdiff
path: root/linux/Documentation/video4linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-20 07:37:17 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-20 07:37:17 -0200
commit75cd5f355fe382a2645a959e6ff2beffa09019da (patch)
treed78404ed6886ea5ab11db15af0ec3deb1bbd9952 /linux/Documentation/video4linux
parentd70b230414d9b4799b0091981a1d4f9cd55d9a84 (diff)
parent3842afc175a16c86d1f3b719f07a3bfddf3c7815 (diff)
downloadmediapointer-dvb-s2-75cd5f355fe382a2645a959e6ff2beffa09019da.tar.gz
mediapointer-dvb-s2-75cd5f355fe382a2645a959e6ff2beffa09019da.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/Documentation/video4linux')
-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 ceb277543..dbc19ca9e 100644
--- a/linux/Documentation/video4linux/CARDLIST.em28xx
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx
@@ -7,7 +7,7 @@
6 -> Terratec Cinergy 200 USB (em2800)
7 -> Leadtek Winfast USB II (em2800)
8 -> Kworld USB2800 (em2800)
- 9 -> Pinnacle Dazzle DVC 90 (em2820/em2840) [2304:0207]
+ 9 -> Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840) [2304:0207,2304:021a]
10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500]
11 -> Terratec Hybrid XS (em2880) [0ccd:0042]
12 -> Kworld PVR TV 2800 RF (em2820/em2840)