summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2008-01-17 20:04:20 -0500
committerSteven Toth <stoth@hauppauge.com>2008-01-17 20:04:20 -0500
commit8fc0933217b6f50fc0e535d90580b68f1c614db5 (patch)
tree21abd871c919db948088cbbf1ce942b9cf958eaf /linux/Documentation
parent34ea7bfe97b2fc9f3cb86a3065cbb89e1f43b3af (diff)
parent42de0c9d677d2af4e41ed7fe4c149427ebeb271e (diff)
downloadmediapointer-dvb-s2-8fc0933217b6f50fc0e535d90580b68f1c614db5.tar.gz
mediapointer-dvb-s2-8fc0933217b6f50fc0e535d90580b68f1c614db5.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/build-fix
From: Steven Toth <stoth@hauppauge.com> merge: http://linuxtv.org/hg/~mkrufky/build-fix Signed-off-by: Steven Toth <stoth@hauppauge.com>
Diffstat (limited to 'linux/Documentation')
-rw-r--r--linux/Documentation/video4linux/CARDLIST.cx881
-rw-r--r--linux/Documentation/video4linux/CARDLIST.tuner1
2 files changed, 2 insertions, 0 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index 82ac8250e..bc5593bd9 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -56,3 +56,4 @@
55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM [c180:c980]
56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder [0070:9600,0070:9601,0070:9602]
57 -> ADS Tech Instant Video PCI [1421:0390]
+ 58 -> Pinnacle PCTV HD 800i [11bd:0051]
diff --git a/linux/Documentation/video4linux/CARDLIST.tuner b/linux/Documentation/video4linux/CARDLIST.tuner
index 2211c8eac..0e2394695 100644
--- a/linux/Documentation/video4linux/CARDLIST.tuner
+++ b/linux/Documentation/video4linux/CARDLIST.tuner
@@ -73,3 +73,4 @@ tuner=71 - Xceive xc2028/xc3028 tuner
tuner=72 - Thomson FE6600
tuner=73 - Samsung TCPG 6121P30A
tuner=75 - Philips TEA5761 FM Radio
+tuner=76 - Xceive 5000 tuner