aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index fc1752b48b55..1f39b5c0786c 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -83,7 +83,7 @@
83 82 -> MSI TV@Anywhere plus [1462:6231] 83 82 -> MSI TV@Anywhere plus [1462:6231]
84 83 -> Terratec Cinergy 250 PCI TV [153b:1160] 84 83 -> Terratec Cinergy 250 PCI TV [153b:1160]
85 84 -> LifeView FlyDVB Trio [5168:0319] 85 84 -> LifeView FlyDVB Trio [5168:0319]
86 85 -> AverTV DVB-T 777 [1461:2c05] 86 85 -> AverTV DVB-T 777 [1461:2c05,1461:2c05]
87 86 -> LifeView FlyDVB-T / Genius VideoWonder DVB-T [5168:0301,1489:0301] 87 86 -> LifeView FlyDVB-T / Genius VideoWonder DVB-T [5168:0301,1489:0301]
88 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] 88 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421]
89 88 -> Tevion/KWorld DVB-T 220RF [17de:7201] 89 88 -> Tevion/KWorld DVB-T 220RF [17de:7201]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 99f2e6421302..6481bf7797b0 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3398,7 +3398,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
3398 .driver_data = SAA7134_BOARD_FLYDVB_TRIO, 3398 .driver_data = SAA7134_BOARD_FLYDVB_TRIO,
3399 },{ 3399 },{
3400 .vendor = PCI_VENDOR_ID_PHILIPS, 3400 .vendor = PCI_VENDOR_ID_PHILIPS,
3401 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, /* SAA 7131E */ 3401 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
3402 .subvendor = 0x1461, 3402 .subvendor = 0x1461,
3403 .subdevice = 0x2c05, 3403 .subdevice = 0x2c05,
3404 .driver_data = SAA7134_BOARD_AVERMEDIA_777, 3404 .driver_data = SAA7134_BOARD_AVERMEDIA_777,
@@ -3481,6 +3481,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
3481 .subdevice = 0x0008, 3481 .subdevice = 0x0008,
3482 .driver_data = SAA7134_BOARD_MEDION_MD8800_QUADRO, 3482 .driver_data = SAA7134_BOARD_MEDION_MD8800_QUADRO,
3483 },{ 3483 },{
3484 .vendor = PCI_VENDOR_ID_PHILIPS,
3485 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
3486 .subvendor = 0x1461,
3487 .subdevice = 0x2c05,
3488 .driver_data = SAA7134_BOARD_AVERMEDIA_777,
3489 },{
3484 /* --- boards without eeprom + subsystem ID --- */ 3490 /* --- boards without eeprom + subsystem ID --- */
3485 .vendor = PCI_VENDOR_ID_PHILIPS, 3491 .vendor = PCI_VENDOR_ID_PHILIPS,
3486 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 3492 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,