aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index dd979dca8af6..335aef4dcaeb 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -10,7 +10,7 @@
10 9 -> Medion 5044 10 9 -> Medion 5044
11 10 -> Kworld/KuroutoShikou SAA7130-TVPCI 11 10 -> Kworld/KuroutoShikou SAA7130-TVPCI
12 11 -> Terratec Cinergy 600 TV [153b:1143] 12 11 -> Terratec Cinergy 600 TV [153b:1143]
13 12 -> Medion 7134 [16be:0003] 13 12 -> Medion 7134 [16be:0003,16be:5000]
14 13 -> Typhoon TV+Radio 90031 14 13 -> Typhoon TV+Radio 90031
15 14 -> ELSA EX-VISION 300TV [1048:226b] 15 14 -> ELSA EX-VISION 300TV [1048:226b]
16 15 -> ELSA EX-VISION 500TV [1048:226a] 16 15 -> ELSA EX-VISION 500TV [1048:226a]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index f0b95804e414..a2e3f6729c5b 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4773,6 +4773,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4773 .driver_data = SAA7134_BOARD_MD7134, 4773 .driver_data = SAA7134_BOARD_MD7134,
4774 },{ 4774 },{
4775 .vendor = PCI_VENDOR_ID_PHILIPS, 4775 .vendor = PCI_VENDOR_ID_PHILIPS,
4776 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
4777 .subvendor = 0x16be, /* CTX946 analog TV, HW mpeg, DVB-T */
4778 .subdevice = 0x5000, /* only analog TV and DVB-T for now */
4779 .driver_data = SAA7134_BOARD_MD7134,
4780 }, {
4781 .vendor = PCI_VENDOR_ID_PHILIPS,
4776 .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 4782 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
4777 .subvendor = 0x1048, 4783 .subvendor = 0x1048,
4778 .subdevice = 0x226b, 4784 .subdevice = 0x226b,