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 51f8a3fd66dc..9cbb048f4ebc 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -53,7 +53,7 @@
53 52 -> AverMedia AverTV/305 [1461:2108] 53 52 -> AverMedia AverTV/305 [1461:2108]
54 53 -> ASUS TV-FM 7135 [1043:4845] 54 53 -> ASUS TV-FM 7135 [1043:4845]
55 54 -> LifeView FlyTV Platinum FM / Gold [5168:0214,1489:0214,5168:0304] 55 54 -> LifeView FlyTV Platinum FM / Gold [5168:0214,1489:0214,5168:0304]
56 55 -> LifeView FlyDVB-T DUO [5168:0306] 56 55 -> LifeView FlyDVB-T DUO / MSI TV@nywhere Duo [5168:0306,4E42:0306]
57 56 -> Avermedia AVerTV 307 [1461:a70a] 57 56 -> Avermedia AVerTV 307 [1461:a70a]
58 57 -> Avermedia AVerTV GO 007 FM [1461:f31f] 58 57 -> Avermedia AVerTV GO 007 FM [1461:f31f]
59 58 -> ADS Tech Instant TV (saa7135) [1421:0350,1421:0351,1421:0370,1421:1370] 59 58 -> ADS Tech Instant TV (saa7135) [1421:0350,1421:0351,1421:0370,1421:1370]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 23cd5f6bed17..7572e937c387 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1778,7 +1778,7 @@ struct saa7134_board saa7134_boards[] = {
1778 [SAA7134_BOARD_FLYDVBTDUO] = { 1778 [SAA7134_BOARD_FLYDVBTDUO] = {
1779 /* LifeView FlyDVB-T DUO */ 1779 /* LifeView FlyDVB-T DUO */
1780 /* "Nico Sabbi <nsabbi@tiscali.it> Hartmut Hackmann hartmut.hackmann@t-online.de*/ 1780 /* "Nico Sabbi <nsabbi@tiscali.it> Hartmut Hackmann hartmut.hackmann@t-online.de*/
1781 .name = "LifeView FlyDVB-T DUO", 1781 .name = "LifeView FlyDVB-T DUO / MSI TV@nywhere Duo",
1782 .audio_clock = 0x00200000, 1782 .audio_clock = 0x00200000,
1783 .tuner_type = TUNER_PHILIPS_TDA8290, 1783 .tuner_type = TUNER_PHILIPS_TDA8290,
1784 .radio_type = UNSET, 1784 .radio_type = UNSET,
@@ -4026,6 +4026,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4026 .subdevice = 0xf31e, 4026 .subdevice = 0xf31e,
4027 .driver_data = SAA7134_BOARD_AVERMEDIA_M102, 4027 .driver_data = SAA7134_BOARD_AVERMEDIA_M102,
4028 },{ 4028 },{
4029 .vendor = PCI_VENDOR_ID_PHILIPS,
4030 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
4031 .subvendor = 0x4E42, /* MSI */
4032 .subdevice = 0x0306, /* TV@nywhere DUO */
4033 .driver_data = SAA7134_BOARD_FLYDVBTDUO,
4034 },{
4029 /* --- boards without eeprom + subsystem ID --- */ 4035 /* --- boards without eeprom + subsystem ID --- */
4030 .vendor = PCI_VENDOR_ID_PHILIPS, 4036 .vendor = PCI_VENDOR_ID_PHILIPS,
4031 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 4037 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,