summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-01 05:22:37 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-01 05:22:37 -0300
commitf132c7131268f8f4453e59546b2c989af12687bc (patch)
tree128bda02b3b602426e003d787cb231622c73e544 /linux/Documentation
parentb8991839208bf9058df16c5afdc4abe46aed454d (diff)
parentded3cfe6e3debc87d199572ce1c62204c5a37391 (diff)
downloadmediapointer-dvb-s2-f132c7131268f8f4453e59546b2c989af12687bc.tar.gz
mediapointer-dvb-s2-f132c7131268f8f4453e59546b2c989af12687bc.tar.bz2
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
-rw-r--r--linux/Documentation/video4linux/CARDLIST.cx238851
-rw-r--r--linux/Documentation/video4linux/CARDLIST.cx881
2 files changed, 2 insertions, 0 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.cx23885 b/linux/Documentation/video4linux/CARDLIST.cx23885
index 948e43610..450b8f8c3 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx23885
+++ b/linux/Documentation/video4linux/CARDLIST.cx23885
@@ -20,3 +20,4 @@
19 -> Hauppauge WinTV-HVR1275 [0070:2215]
20 -> Hauppauge WinTV-HVR1255 [0070:2251]
21 -> Hauppauge WinTV-HVR1210 [0070:2291,0070:2295]
+ 22 -> Mygica X8506 DMB-TH [14f1:8651]
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index 80527b292..89093f531 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -79,3 +79,4 @@
78 -> Prof 6200 DVB-S [b022:3022]
79 -> Terratec Cinergy HT PCI MKII [153b:1177]
80 -> Hauppauge WinTV-IR Only [0070:9290]
+ 81 -> Leadtek WinFast DTV1800 Hybrid [107d:6654]