Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76e9741d authored by Joe Perches's avatar Joe Perches Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0389b34e

drivers/media/video/bt8xx/bttv-driver.c

+4 −8
Original line number Diff line number Diff line
@@ -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,}

};

drivers/media/video/meye.c

+1 −2
Original line number Diff line number Diff line
@@ -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 },

	{ }

};