diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-06 21:55:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-06 21:55:42 +0300 |
| commit | 5f9251cb93237c9578160df9acc6ce9948ad8c52 (patch) | |
| tree | 5a5718b5a076ce6f04bb3d0e1691aa65d87cc8a8 /drivers/ssb/scan.c | |
| parent | 2c6607c611cb7bf0a6750bcea34a258144e302c5 (diff) | |
| parent | 06778b1c383afbdb88ffd837e117bec06a76f450 (diff) | |
| download | linux-5f9251cb93237c9578160df9acc6ce9948ad8c52.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/ssb/scan.c')
| -rw-r--r-- | drivers/ssb/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index ee079ab9fb28..5a0985d4ce15 100644 --- 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; } } |