Merge ath-current from ath.git

[firefly-linux-kernel-4.4.55.git] / drivers / usb / chipidea / ci_hdrc_pci.c

diff --git a/drivers/usb/chipidea/ci_hdrc_pci.c b/drivers/usb/chipidea/ci_hdrc_pci.c
index 773d150512fa4da6af83e5df10b069cc0276914c..b59195edf63634a3be94bcd3dc9ede6d87699185 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_pci.c
+++ b/drivers/usb/chipidea/ci_hdrc_pci.c
@@ -142,16 +142,16 @@ static const struct pci_device_id ci_hdrc_pci_id_table[] = {
                .driver_data = (kernel_ulong_t)&pci_platdata,
        },
        {
-               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0811),
+               PCI_VDEVICE(INTEL, 0x0811),
                .driver_data = (kernel_ulong_t)&langwell_pci_platdata,
        },
        {
-               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0829),
+               PCI_VDEVICE(INTEL, 0x0829),
                .driver_data = (kernel_ulong_t)&penwell_pci_platdata,
        },
        {
                /* Intel Clovertrail */
-               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe006),
+               PCI_VDEVICE(INTEL, 0xe006),
                .driver_data = (kernel_ulong_t)&penwell_pci_platdata,
        },
        { 0 } /* end: all zeroes */