Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / ssb / scan.c

diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index ee079ab9fb2819b3c18a8e49f6ea5c00be340c79..5a0985d4ce1590b4e32efb5ded52861aabda451d 100644 (file)
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -405,10 +405,10 @@ int ssb_bus_scan(struct ssb_bus *bus,
                                /* Ignore PCI cores on PCI-E cards.
                                 * Ignore PCI-E cores on PCI cards. */
                                if (dev->id.coreid == SSB_DEV_PCI) {
-                                       if (bus->host_pci->is_pcie)
+                                       if (pci_is_pcie(bus->host_pci))
                                                continue;
                                } else {
-                                       if (!bus->host_pci->is_pcie)
+                                       if (!pci_is_pcie(bus->host_pci))
                                                continue;
                                }
                        }