summaryrefslogtreecommitdiff
path: root/linux/Documentation/video4linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-07-05 19:08:55 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-05 19:08:55 -0300
commit784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b (patch)
treefaa5f190e79e79c18b4d56c6fa643e6f251e4563 /linux/Documentation/video4linux
parent33059960a17b83a720e88a4093d4fc40a1a307a4 (diff)
parent59ad1e534e569f743df108421f369cbf915f2e6e (diff)
downloadmediapointer-dvb-s2-784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b.tar.gz
mediapointer-dvb-s2-784f927dcf2cc497d4a2c44fb4f1321d9cf0c45b.tar.bz2
merge: http://linuxtv.org/hg/~awalls/ivtv
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation/video4linux')
-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 873630e7e..2c52f7a70 100644
--- a/linux/Documentation/video4linux/CARDLIST.em28xx
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx
@@ -33,7 +33,7 @@
34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f]
35 -> Typhoon DVD Maker (em2860)
36 -> NetGMBH Cam (em2860)
- 37 -> Gadmei UTV330 (em2860)
+ 37 -> Gadmei UTV330 (em2860) [eb1a:50a6]
38 -> Yakumo MovieMixer (em2861)
39 -> KWorld PVRTV 300U (em2861) [eb1a:e300]
40 -> Plextor ConvertX PX-TV100U (em2861) [093b:a005]
@@ -66,3 +66,4 @@
68 -> Terratec AV350 (em2860) [0ccd:0084]
69 -> KWorld ATSC 315U HDTV TV Box (em2882) [eb1a:a313]
70 -> Evga inDtube (em2882)
+ 71 -> Silvercrest Webcam 1.3mpix (em2820/em2840)