mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 14:43:03 +00:00
V4L/DVB (12204): bttv and meye: Use PCI_VDEVICE
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
0389b34e7c
commit
76e9741d1d
@ -4593,14 +4593,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,}
|
||||
};
|
||||
|
||||
|
@ -1915,8 +1915,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 },
|
||||
{ }
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user