Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[~andy/linux] / Documentation / video4linux / CARDLIST.saa7134

diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 92ce6e25112109203c6cc9974cac5149992a742f..f6201cc37ec5fb608418b2e8b0cf64aeb33911ad 100644 (file)
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -102,3 +102,5 @@
 101 -> Pinnacle PCTV 310i                       [11bd:002f]
 102 -> Avermedia AVerTV Studio 507              [1461:9715]
 103 -> Compro Videomate DVB-T200A
+104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid     [0070:6701]
+105 -> Terratec Cinergy HT PCMCIA               [153b:1172]