diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-07 01:17:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 23:03:09 -0400 |
commit | 593f18c6e4d04134f240fbad001d878802d8925f (patch) | |
tree | 1b36065b310c09c4ce71b3f7815bd33366397c73 | |
parent | 925343ecdfd3f1dafd1049ddd4944621bbe3422e (diff) |
V4L/DVB (6286): Add support for MSI TV @nywhere A/D NB
This is a Lifeview hybrid OEM board.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index 831b4da48b80..67f08cc4be70 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -92,7 +92,7 @@ | |||
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] |
95 | 94 -> LifeView FlyDVB-T Hybrid Cardbus [5168:3306,5168:3502] | 95 | 94 -> LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB [5168:3306,5168:3502,4e42:3502] |
96 | 95 -> LifeView FlyVIDEO3000 (NTSC) [5169:0138] | 96 | 95 -> LifeView FlyVIDEO3000 (NTSC) [5169:0138] |
97 | 96 -> Medion Md8800 Quadro [16be:0007,16be:0008] | 97 | 96 -> Medion Md8800 Quadro [16be:0007,16be:0008] |
98 | 97 -> LifeView FlyDVB-S /Acorp TV134DS [5168:0300,4e42:0300] | 98 | 97 -> LifeView FlyDVB-S /Acorp TV134DS [5168:0300,4e42:0300] |
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 6b6eae82bcfc..62420d599d75 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2898,7 +2898,7 @@ struct saa7134_board saa7134_boards[] = { | |||
2898 | .radio_addr = ADDR_UNSET, | 2898 | .radio_addr = ADDR_UNSET, |
2899 | }, | 2899 | }, |
2900 | [SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS] = { | 2900 | [SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS] = { |
2901 | .name = "LifeView FlyDVB-T Hybrid Cardbus", | 2901 | .name = "LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB", |
2902 | .audio_clock = 0x00200000, | 2902 | .audio_clock = 0x00200000, |
2903 | .tuner_type = TUNER_PHILIPS_TDA8290, | 2903 | .tuner_type = TUNER_PHILIPS_TDA8290, |
2904 | .radio_type = UNSET, | 2904 | .radio_type = UNSET, |
@@ -4281,6 +4281,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
4281 | .subdevice = 0xf01d, /* AVerTV DVB-T Super 007 */ | 4281 | .subdevice = 0xf01d, /* AVerTV DVB-T Super 007 */ |
4282 | .driver_data = SAA7134_BOARD_AVERMEDIA_SUPER_007, | 4282 | .driver_data = SAA7134_BOARD_AVERMEDIA_SUPER_007, |
4283 | },{ | 4283 | },{ |
4284 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4285 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4286 | .subvendor = 0x4e42, | ||
4287 | .subdevice = 0x3502, | ||
4288 | .driver_data = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS | ||
4289 | },{ | ||
4284 | /* --- boards without eeprom + subsystem ID --- */ | 4290 | /* --- boards without eeprom + subsystem ID --- */ |
4285 | .vendor = PCI_VENDOR_ID_PHILIPS, | 4291 | .vendor = PCI_VENDOR_ID_PHILIPS, |
4286 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 4292 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |