diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-16 20:55:42 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-17 01:32:19 +0200 |
| commit | e00cf3b9eb7839b952e434a75bff6b99e47337ac (patch) | |
| tree | ef583ab8ac09bf703026650d4bc7777e6a3864d3 /drivers/ssb/scan.c | |
| parent | net: ping: dont call udp_ioctl() (diff) | |
| parent | mwifiex: use ieee80211_amsdu_to_8023s routine (diff) | |
| download | linux-e00cf3b9eb7839b952e434a75bff6b99e47337ac.tar.xz linux-e00cf3b9eb7839b952e434a75bff6b99e47337ac.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/mac80211/sta_info.h
Diffstat (limited to 'drivers/ssb/scan.c')
| -rw-r--r-- | drivers/ssb/scan.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index 7dca719fbcfb..45e5babd3961 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c @@ -258,7 +258,10 @@ static int we_support_multiple_80211_cores(struct ssb_bus *bus) #ifdef CONFIG_SSB_PCIHOST if (bus->bustype == SSB_BUSTYPE_PCI) { if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM && - bus->host_pci->device == 0x4324) + ((bus->host_pci->device == 0x4313) || + (bus->host_pci->device == 0x431A) || + (bus->host_pci->device == 0x4321) || + (bus->host_pci->device == 0x4324))) return 1; } #endif /* CONFIG_SSB_PCIHOST */ |