summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-10-04 14:33:11 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-04 14:33:11 -0300
commit7e6dc327e79b2a3b6f430df42cd212ab82f2220e (patch)
tree7aa7741da8575bd94ec45a251cf9194b0ee50286 /linux/Documentation
parentf48cc706c1b203e3e10d3e30380e96d27c5bf858 (diff)
parent0bde6f869cdcf61aec023543219643c10f59e23a (diff)
downloadmediapointer-dvb-s2-7e6dc327e79b2a3b6f430df42cd212ab82f2220e.tar.gz
mediapointer-dvb-s2-7e6dc327e79b2a3b6f430df42cd212ab82f2220e.tar.bz2
merge: http://linuxtv.org/hg/~dougsland/em28xx-310u
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
-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 b9181b523..187cc48d0 100644
--- a/linux/Documentation/video4linux/CARDLIST.em28xx
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx
@@ -46,7 +46,7 @@
45 -> Pinnacle PCTV DVB-T (em2870)
46 -> Compro, VideoMate U3 (em2870) [185b:2870]
47 -> KWorld DVB-T 305U (em2880) [eb1a:e305]
- 48 -> KWorld DVB-T 310U (em2880)
+ 48 -> KWorld DVB-T 310U (em2880) [eb1a:e310]
49 -> MSI DigiVox A/D (em2880) [eb1a:e310]
50 -> MSI DigiVox A/D II (em2880) [eb1a:e320]
51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c]