diff options
| author | Gerd Knorr <devnull@localhost> | 2005-01-11 14:17:48 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-01-11 14:17:48 +0000 |
| commit | 536b5f23cf70a3847af7d2bdae177e7c169a0256 (patch) | |
| tree | 8a71a3f947ad542ab06c4ecb524318b005c0057c /linux/drivers/media/video/saa7134 | |
| parent | 4c4023a4a1aef55ff9de69f7f9aff8a646222bff (diff) | |
| download | mediapointer-dvb-s2-536b5f23cf70a3847af7d2bdae177e7c169a0256.tar.gz mediapointer-dvb-s2-536b5f23cf70a3847af7d2bdae177e7c169a0256.tar.bz2 | |
- misc card fixes.
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index c90f0b912..3e3455ecd 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,6 +1,6 @@ /* - * $Id: saa7134-cards.c,v 1.46 2004/12/14 15:33:30 kraxel Exp $ + * $Id: saa7134-cards.c,v 1.47 2005/01/11 14:17:48 kraxel Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -445,11 +445,11 @@ struct saa7134_board saa7134_boards[] = { },{ .name = name_comp1, .vmux = 0, - .amux = LINE2, + .amux = LINE1, },{ .name = name_svideo, .vmux = 8, - .amux = LINE2, + .amux = LINE1, }}, .radio = { .name = name_radio, @@ -647,7 +647,7 @@ struct saa7134_board saa7134_boards[] = { },{ .name = name_tv, .vmux = 1, - .amux = LINE2_LEFT, + .amux = LINE2, .tv = 1, }}, }, @@ -829,6 +829,10 @@ struct saa7134_board saa7134_boards[] = { .name = name_radio, .amux = LINE2, }, + .mute = { + .name = name_mute, + .amux = LINE1, + }, }, [SAA7134_BOARD_MANLI_MTV001] = { /* Ognjen Nastic <ognjen@logosoft.ba> UNTESTED */ @@ -1118,7 +1122,7 @@ struct saa7134_board saa7134_boards[] = { },{ .name = name_tv, .vmux = 1, - .amux = LINE2, + .amux = LINE2_LEFT, .tv = 1, .gpio = 0x00080, }}, @@ -1642,14 +1646,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subvendor = 0x153B, .subdevice = 0x1152, .driver_data = SAA7134_BOARD_CINERGY200, - },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7130, .subvendor = 0x185b, .subdevice = 0xc100, .driver_data = SAA7134_BOARD_VIDEOMATE_TV_PVR, - },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7130, @@ -1668,6 +1670,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subvendor = 0x185b, .subdevice = 0xc200, .driver_data = SAA7134_BOARD_VIDEOMATE_GOLD_PLUS, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7134, + .subvendor = 0x1540, + .subdevice = 0x9524, + .driver_data = SAA7134_BOARD_PROVIDEO_PV952, },{ /* --- boards without eeprom + subsystem ID --- */ @@ -1682,12 +1690,6 @@ struct pci_device_id saa7134_pci_tbl[] = { .subvendor = PCI_VENDOR_ID_PHILIPS, .subdevice = 0, .driver_data = SAA7134_BOARD_NOAUTO, - },{ - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7134, - .subvendor = 0x1540, - .subdevice = 0x9524, - .driver_data = SAA7134_BOARD_PROVIDEO_PV952, },{ /* --- default catch --- */ |