summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-03-18 09:40:43 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-03-18 09:40:43 -0300
commit9dc9f909cf3815bc60336feecea6dce9f437f042 (patch)
tree995941d39233691aab80d0a61cd5c0e402aede17 /linux/Documentation
parentb1fad223c39000c4e5e8be80928035406ae8ccce (diff)
parentbf840a1818e11630aa2cd995cb96fca712d1a314 (diff)
downloadmediapointer-dvb-s2-9dc9f909cf3815bc60336feecea6dce9f437f042.tar.gz
mediapointer-dvb-s2-9dc9f909cf3815bc60336feecea6dce9f437f042.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/tda18271
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/Documentation')
-rw-r--r--linux/Documentation/video4linux/CARDLIST.bttv2
-rw-r--r--linux/Documentation/video4linux/CARDLIST.cx881
2 files changed, 3 insertions, 0 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv
index d97cf7cc6..f32efb6fb 100644
--- a/linux/Documentation/video4linux/CARDLIST.bttv
+++ b/linux/Documentation/video4linux/CARDLIST.bttv
@@ -148,3 +148,5 @@
147 -> VoodooTV 200 (USA) [121a:3000]
148 -> DViCO FusionHDTV 2 [dbc0:d200]
149 -> Typhoon TV-Tuner PCI (50684)
+150 -> Geovision GV-600 [008a:763c]
+151 -> Kozumi KTV-01C
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index da7f70dfa..a01991dcb 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -64,3 +64,4 @@
63 -> Geniatech X8000-MT DVBT [14f1:8852]
64 -> DViCO FusionHDTV DVB-T PRO [18ac:db30]
65 -> DViCO FusionHDTV 7 Gold [18ac:d610]
+ 66 -> Prolink Pixelview MPEG 8000GT [1554:4935]