diff options
| author | Peter De Schrijver <p2@psychaos.be> | 2011-11-06 10:47:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-08 11:22:24 -0200 |
| commit | c540d9f13d1f0f6913434b0b8241bb6270818769 (patch) | |
| tree | d833dd575a08d42c342bfbb5bdb9a7e3cdf02745 /drivers/media/video | |
| parent | de2843b663fd621e9a6c75fed4da73e8c9a1b094 (diff) | |
| download | linux-3.10-c540d9f13d1f0f6913434b0b8241bb6270818769.tar.gz linux-3.10-c540d9f13d1f0f6913434b0b8241bb6270818769.tar.bz2 linux-3.10-c540d9f13d1f0f6913434b0b8241bb6270818769.zip | |
[media] bt8xx: add support for PCI device ID 0x36c
add support for conexant PCI device 0x36c. Seems to be fully compatible with
the currently supported chips, yet the chip has different PCI ID.
Signed-off-by: Peter De Schrijver <p2@psychaos.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/bt8xx/bt848.h | 5 | ||||
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bt848.h b/drivers/media/video/bt8xx/bt848.h index 0bcd95303bb..c37e6acffde 100644 --- a/drivers/media/video/bt8xx/bt848.h +++ b/drivers/media/video/bt8xx/bt848.h @@ -30,6 +30,10 @@ #ifndef PCI_DEVICE_ID_BT849 #define PCI_DEVICE_ID_BT849 0x351 #endif +#ifndef PCI_DEVICE_ID_FUSION879 +#define PCI_DEVICE_ID_FUSION879 0x36c +#endif + #ifndef PCI_DEVICE_ID_BT878 #define PCI_DEVICE_ID_BT878 0x36e #endif @@ -37,7 +41,6 @@ #define PCI_DEVICE_ID_BT879 0x36f #endif - /* Brooktree 848 registers */ #define BT848_DSTATUS 0x000 diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 3dd06607aec..76c301f0509 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c @@ -4572,6 +4572,7 @@ static struct pci_device_id bttv_pci_tbl[] = { {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0}, {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0}, {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_FUSION879), 0}, {0,} }; |