diff options
author | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-02-19 01:24:18 +0000 |
---|---|---|
committer | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-02-19 01:24:18 +0000 |
commit | e6b6adc799afe7d6d847c683968b1eee7d82d85a (patch) | |
tree | 4ec281edc01346323acc18c682b99321c7c776db /target/linux/generic-2.6/files/drivers/ssb/scan.c | |
parent | b338f05ee4ea7a93400472733e4f5141b5e42cc5 (diff) |
ssb: Update to latest upstream version of ssb.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10490 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 96258c609..63ee5cfbe 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"); |