diff options
| author | John W. Linville | 2013-10-17 20:02:07 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-10-17 20:02:07 +0200 |
| commit | 9f96da4dd2ccf685b506a21104cb13b1aadd907a (patch) | |
| tree | 5d9eff61123f096e2434a9d36e6fdbd4cc5c6292 /drivers/net/wireless/brcm80211 | |
| parent | tcp: tcp_transmit_skb() optimizations (diff) | |
| parent | rt2x00: rt2800lib: remove duplicate rf_vals for RF3053 (diff) | |
| download | kernel-qcow2-linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.gz kernel-qcow2-linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.xz kernel-qcow2-linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/brcm80211')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index 69b14dc4dd55..8138f1cff4e5 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -5695,7 +5695,7 @@ static bool brcms_c_chipmatch_pci(struct bcma_device *core) return true; if ((device == BCM43224_D11N_ID) || (device == BCM43225_D11N2G_ID)) return true; - if (device == BCM4313_D11N2G_ID) + if (device == BCM4313_D11N2G_ID || device == BCM4313_CHIP_ID) return true; if ((device == BCM43236_D11N_ID) || (device == BCM43236_D11N2G_ID)) return true; |