diff options
| author | Michael Büsch <mb@bu3sch.de> | 2008-02-19 01:24:18 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2008-02-19 01:24:18 +0000 |
| commit | c57ca284ce95dbe3ab1024c2deb8055664b5bddc (patch) | |
| tree | 06117d87981d37b0ae0fdca63bfb071e9ea36001 /target/linux/generic-2.6/files/drivers/ssb/scan.c | |
| parent | 7b2430f27161a870f57871eb2a480da97b065ba9 (diff) | |
| download | master-31e0f0ae-c57ca284ce95dbe3ab1024c2deb8055664b5bddc.tar.gz master-31e0f0ae-c57ca284ce95dbe3ab1024c2deb8055664b5bddc.tar.bz2 master-31e0f0ae-c57ca284ce95dbe3ab1024c2deb8055664b5bddc.zip | |
ssb: Update to latest upstream version of ssb.
SVN-Revision: 10490
Diffstat (limited to 'target/linux/generic-2.6/files/drivers/ssb/scan.c')
| -rw-r--r-- | target/linux/generic-2.6/files/drivers/ssb/scan.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/files/drivers/ssb/scan.c b/target/linux/generic-2.6/files/drivers/ssb/scan.c index 96258c6091..63ee5cfbef 100644 --- a/target/linux/generic-2.6/files/drivers/ssb/scan.c +++ b/target/linux/generic-2.6/files/drivers/ssb/scan.c @@ -388,6 +388,17 @@ int ssb_bus_scan(struct ssb_bus *bus, case SSB_DEV_PCI: case SSB_DEV_PCIE: #ifdef CONFIG_SSB_DRIVER_PCICORE + if (bus->bustype == SSB_BUSTYPE_PCI) { + /* 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) + continue; + } else { + if (!bus->host_pci->is_pcie) + continue; + } + } if (bus->pcicore.dev) { ssb_printk(KERN_WARNING PFX "WARNING: Multiple PCI(E) cores found\n"); |