Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra

[firefly-linux-kernel-4.4.55.git] / drivers / atm / firestream.c

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 6e600afd06ae6d0fbbaeb96d7aa02093954771b5..8717809787fb7af21069dd726e11abbdcff70ee5 100644 (file)
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -2027,10 +2027,8 @@ static void __devexit firestream_remove_one (struct pci_dev *pdev)
 }
 
 static struct pci_device_id firestream_pci_tbl[] = {
-       { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50, 
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS50},
-       { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155, 
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS155},
+       { PCI_VDEVICE(FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50), FS_IS50},
+       { PCI_VDEVICE(FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155), FS_IS155},
        { 0, }
 };