diff options
| author | Douglas Schilling Landgraf <dougsland@redhat.com> | 2009-07-05 15:59:21 -0300 |
|---|---|---|
| committer | Douglas Schilling Landgraf <dougsland@redhat.com> | 2009-07-05 15:59:21 -0300 |
| commit | 3304a5198cc1315ca633f1d17bcbdb36a07e9bfb (patch) | |
| tree | 4f4681ecbe205e61a06b4f70cf3cb581c85ce2bc | |
| parent | 0082053685c27f18e24c1d3e564bb43f51fc28f4 (diff) | |
| download | mediapointer-dvb-s2-3304a5198cc1315ca633f1d17bcbdb36a07e9bfb.tar.gz mediapointer-dvb-s2-3304a5198cc1315ca633f1d17bcbdb36a07e9bfb.tar.bz2 | |
bttv and meye: Use PCI_VDEVICE
From: Joe Perches <joe@perches.com>
Priority: normal
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 12 | ||||
| -rw-r--r-- | linux/drivers/media/video/meye.c | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 27be1694b..bd5dde3f8 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -4628,14 +4628,10 @@ static int bttv_resume(struct pci_dev *pci_dev) #endif static struct pci_device_id bttv_pci_tbl[] = { - {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT878, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT879, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT848), 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0}, + {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 0}, {0,} }; diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c index 1fb7024a5..1d0a0cc81 100644 --- a/linux/drivers/media/video/meye.c +++ b/linux/drivers/media/video/meye.c @@ -1925,8 +1925,7 @@ static void __devexit meye_remove(struct pci_dev *pcidev) } static struct pci_device_id meye_pci_tbl[] = { - { PCI_VENDOR_ID_KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VDEVICE(KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002), 0 }, { } }; |