diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-08 20:27:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-08 20:27:31 -0300 |
| commit | 181bad1c6e309a3354b23764ce9477ea7e92a4dc (patch) | |
| tree | ad3e855f6c00da3dd24f02aead629035c11884f9 /linux/drivers/media/video/saa7134 | |
| parent | 5e6cdba00846ee65b8b90acc49c71e23119defcb (diff) | |
| parent | ec7b7ceb81ec0b2cec7122e92e6ba7792c34c32b (diff) | |
| download | mediapointer-dvb-s2-181bad1c6e309a3354b23764ce9477ea7e92a4dc.tar.gz mediapointer-dvb-s2-181bad1c6e309a3354b23764ce9477ea7e92a4dc.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/pending
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 95a542010..797436b9a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -2822,7 +2822,7 @@ struct saa7134_board saa7134_boards[] = { }, }, [SAA7134_BOARD_KWORLD_ATSC110] = { - .name = "Kworld ATSC110", + .name = "Kworld ATSC110/115", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TUV1236D, .radio_type = UNSET, @@ -4123,6 +4123,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .driver_data = SAA7134_BOARD_KWORLD_ATSC110, },{ .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */ + .subvendor = 0x17de, + .subdevice = 0x7352, + .driver_data = SAA7134_BOARD_KWORLD_ATSC110, /* ATSC 115 */ + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, .subvendor = 0x1461, .subdevice = 0x7360, |