diff options
| author | Gerd Knorr <devnull@localhost> | 2004-11-08 10:57:32 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-11-08 10:57:32 +0000 |
| commit | d7b658e303859286c3cf8de4954205a4e5c9eeea (patch) | |
| tree | 0e41311a4d43c99db125f3ce1f2f6fa9f3ae90e8 /linux/drivers | |
| parent | 14e9354880dc13e84a22b5bf7b71e32c652d9e5a (diff) | |
| download | mediapointer-dvb-s2-d7b658e303859286c3cf8de4954205a4e5c9eeea.tar.gz mediapointer-dvb-s2-d7b658e303859286c3cf8de4954205a4e5c9eeea.tar.bz2 | |
- saa7134: cardlist update (Michael Rodriguez-Torrent).
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 53bce030f..c9a15ccbd 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.35 2004/11/07 14:44:59 kraxel Exp $ + * $Id: saa7134-cards.c,v 1.36 2004/11/08 10:57:32 kraxel Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -1129,21 +1129,20 @@ struct saa7134_board saa7134_boards[] = { }, }, [SAA7134_BOARD_SABRENT_SBTTVFM] = { - /* Michael Rodriguez-Torrent */ + /* Michael Rodriguez-Torrent <mrtorrent@asu.edu> */ .name = "Sabrent SBT-TVFM (saa7130)", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_NTSC_M, - .tda9887_conf = TDA9887_PRESENT, .inputs = {{ + .name = name_comp1, + .vmux = 1, + .amux = LINE2, + },{ .name = name_tv, .vmux = 3, .amux = LINE2, .tv = 1, },{ - .name = name_comp1, - .vmux = 1, - .amux = LINE2, - },{ .name = name_svideo, .vmux = 8, .amux = LINE2, @@ -1519,6 +1518,12 @@ struct pci_device_id saa7134_pci_tbl[] = { },{ .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7130, + .subvendor = 0x1131, + .subdevice = 0, + .driver_data = SAA7134_BOARD_SABRENT_SBTTVFM, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, .subvendor = 0x1461, /* Avermedia Technologies Inc */ .subdevice = 0x9715, @@ -1641,6 +1646,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) case SAA7134_BOARD_ECS_TVP3XP_4CB5: case SAA7134_BOARD_MD2819: case SAA7134_BOARD_AVERMEDIA_307: +// case SAA7134_BOARD_SABRENT_SBTTVFM: /* not finished yet */ dev->has_remote = 1; break; case SAA7134_BOARD_AVACSSMARTTV: |