Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 14:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (12204): bttv and meye: Use PCI_VDEVICE

Browse Source 
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:
Joe Perches 2009-07-05 15:59:21 -03:00 committed by Mauro Carvalho Chehab
parent 0389b34e7c
commit 76e9741d1d
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/video/bt8xx/bttv-driver.c
View File

@ -4593,14 +4593,10 @@ static int bttv_resume(struct pci_dev *pci_dev)
#endif #endif
static struct pci_device_id bttv_pci_tbl[] = { static struct pci_device_id bttv_pci_tbl[] = {
{PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848, {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT848), 0},
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0},
{PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849, {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0},
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 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},
{0,} {0,}
}; };

3
drivers/media/video/meye.c
View File

@ -1915,8 +1915,7 @@ static void __devexit meye_remove(struct pci_dev *pcidev)
} }
static struct pci_device_id meye_pci_tbl[] = { static struct pci_device_id meye_pci_tbl[] = {
{ PCI_VENDOR_ID_KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002, { PCI_VDEVICE(KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002), 0 },
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ } { }
}; };