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 67f08cc4be70..a14545300e4c 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -88,7 +88,7 @@
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]
90 89 -> ELSA EX-VISION 700TV [1048:226c] 90 89 -> ELSA EX-VISION 700TV [1048:226c]
91 90 -> Kworld ATSC110 [17de:7350] 91 90 -> Kworld ATSC110/115 [17de:7350,17de:7352]
92 91 -> AVerMedia A169 B [1461:7360] 92 91 -> AVerMedia A169 B [1461:7360]
93 92 -> AVerMedia A169 B1 [1461:6360] 93 92 -> AVerMedia A169 B1 [1461:6360]
94 93 -> Medion 7134 Bridge #2 [16be:0005] 94 93 -> Medion 7134 Bridge #2 [16be:0005]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 62420d599d75..a4c192fb4e41 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2822,7 +2822,7 @@ struct saa7134_board saa7134_boards[] = {
2822 }, 2822 },
2823 }, 2823 },
2824 [SAA7134_BOARD_KWORLD_ATSC110] = { 2824 [SAA7134_BOARD_KWORLD_ATSC110] = {
2825 .name = "Kworld ATSC110", 2825 .name = "Kworld ATSC110/115",
2826 .audio_clock = 0x00187de7, 2826 .audio_clock = 0x00187de7,
2827 .tuner_type = TUNER_PHILIPS_TUV1236D, 2827 .tuner_type = TUNER_PHILIPS_TUV1236D,
2828 .radio_type = UNSET, 2828 .radio_type = UNSET,
@@ -4084,6 +4084,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4084 .driver_data = SAA7134_BOARD_KWORLD_ATSC110, 4084 .driver_data = SAA7134_BOARD_KWORLD_ATSC110,
4085 },{ 4085 },{
4086 .vendor = PCI_VENDOR_ID_PHILIPS, 4086 .vendor = PCI_VENDOR_ID_PHILIPS,
4087 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
4088 .subvendor = 0x17de,
4089 .subdevice = 0x7352,
4090 .driver_data = SAA7134_BOARD_KWORLD_ATSC110, /* ATSC 115 */
4091 },{
4092 .vendor = PCI_VENDOR_ID_PHILIPS,
4087 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 4093 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
4088 .subvendor = 0x1461, 4094 .subvendor = 0x1461,
4089 .subdevice = 0x7360, 4095 .subdevice = 0x7360,