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

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

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 90a5a7cac740ed195c9a73b62d3288ec3db697fe..80f9f3659e4d83f246bafb936c2490ff15455c4a 100644 (file)
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2269,10 +2269,8 @@ out0:
 
 
 static struct pci_device_id eni_pci_tbl[] = {
-       { PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_FPGA, PCI_ANY_ID, PCI_ANY_ID,
-         0, 0, 0 /* FPGA */ },
-       { PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_ASIC, PCI_ANY_ID, PCI_ANY_ID,
-         0, 0, 1 /* ASIC */ },
+       { PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_FPGA), 0 /* FPGA */ },
+       { PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_ASIC), 1 /* ASIC */ },
        { 0, }
 };
 MODULE_DEVICE_TABLE(pci,eni_pci_tbl);