summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-19 07:04:16 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-19 07:04:16 -0300
commite3a620022ff190fda2954e1e2c7b83d0aff8ef1b (patch)
tree5a4525247af55376d185ef411c295e0436f13349 /linux/Documentation
parentfafa73afff3347cd279b9db9f82bf9e8f2751401 (diff)
parent028b650ff39328bbebc163ce60dfd72051ef0d9f (diff)
downloadmediapointer-dvb-s2-e3a620022ff190fda2954e1e2c7b83d0aff8ef1b.tar.gz
mediapointer-dvb-s2-e3a620022ff190fda2954e1e2c7b83d0aff8ef1b.tar.bz2
merge: http://linuxtv.org/hg/~stoth/hvr1200
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.cx238852
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.cx23885 b/linux/Documentation/video4linux/CARDLIST.cx23885
index 0924e6e14..b057a3c9f 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx23885
+++ b/linux/Documentation/video4linux/CARDLIST.cx23885
@@ -5,3 +5,5 @@
4 -> DViCO FusionHDTV5 Express [18ac:d500]
5 -> Hauppauge WinTV-HVR1500Q [0070:7790,0070:7797]
6 -> Hauppauge WinTV-HVR1500 [0070:7710,0070:7717]
+ 7 -> Hauppauge WinTV-HVR1200 [0070:71d1]
+ 8 -> Hauppauge WinTV-HVR1700 [0070:8101]