diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index a14545300e4c..29ca16cdb713 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -102,7 +102,7 @@ | |||
102 | 101 -> Pinnacle PCTV 310i [11bd:002f] | 102 | 101 -> Pinnacle PCTV 310i [11bd:002f] |
103 | 102 -> Avermedia AVerTV Studio 507 [1461:9715] | 103 | 102 -> Avermedia AVerTV Studio 507 [1461:9715] |
104 | 103 -> Compro Videomate DVB-T200A | 104 | 103 -> Compro Videomate DVB-T200A |
105 | 104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid [0070:6701] | 105 | 104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid [0070:6700,0070:6701,0070:6702,0070:6703,0070:6704,0070:6705] |
106 | 105 -> Terratec Cinergy HT PCMCIA [153b:1172] | 106 | 105 -> Terratec Cinergy HT PCMCIA [153b:1172] |
107 | 106 -> Encore ENLTV [1131:2342,1131:2341,3016:2344] | 107 | 106 -> Encore ENLTV [1131:2342,1131:2341,3016:2344] |
108 | 107 -> Encore ENLTV-FM [1131:230f] | 108 | 107 -> Encore ENLTV-FM [1131:230f] |
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 78d7d7059a9e..138cec8bb023 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -4207,11 +4207,41 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
4207 | .vendor = PCI_VENDOR_ID_PHILIPS, | 4207 | .vendor = PCI_VENDOR_ID_PHILIPS, |
4208 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 4208 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
4209 | .subvendor = 0x0070, | 4209 | .subvendor = 0x0070, |
4210 | .subdevice = 0x6700, | ||
4211 | .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110, | ||
4212 | },{ | ||
4213 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4214 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4215 | .subvendor = 0x0070, | ||
4210 | .subdevice = 0x6701, | 4216 | .subdevice = 0x6701, |
4211 | .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110, | 4217 | .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110, |
4212 | },{ | 4218 | },{ |
4213 | .vendor = PCI_VENDOR_ID_PHILIPS, | 4219 | .vendor = PCI_VENDOR_ID_PHILIPS, |
4214 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 4220 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
4221 | .subvendor = 0x0070, | ||
4222 | .subdevice = 0x6702, | ||
4223 | .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110, | ||
4224 | },{ | ||
4225 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4226 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4227 | .subvendor = 0x0070, | ||
4228 | .subdevice = 0x6703, | ||
4229 | .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110, | ||
4230 | },{ | ||
4231 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4232 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4233 | .subvendor = 0x0070, | ||
4234 | .subdevice = 0x6704, | ||
4235 | .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110, | ||
4236 | },{ | ||
4237 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4238 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4239 | .subvendor = 0x0070, | ||
4240 | .subdevice = 0x6705, | ||
4241 | .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110, | ||
4242 | },{ | ||
4243 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4244 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4215 | .subvendor = 0x153b, | 4245 | .subvendor = 0x153b, |
4216 | .subdevice = 0x1172, | 4246 | .subdevice = 0x1172, |
4217 | .driver_data = SAA7134_BOARD_CINERGY_HT_PCMCIA, | 4247 | .driver_data = SAA7134_BOARD_CINERGY_HT_PCMCIA, |