--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
-@@ -4537,7 +4537,8 @@ static int brcms_b_attach(struct brcms_c
+@@ -4502,7 +4502,8 @@ static int brcms_b_attach(struct brcms_c
/* check device id(srom, nvram etc.) to set bands */
if (wlc_hw->deviceid == BCM43224_D11N_ID ||
/* Dualband boards */
wlc_hw->_nbands = 2;
else
-@@ -5797,7 +5798,7 @@ static bool brcms_c_chipmatch_pci(struct
+@@ -5655,7 +5656,7 @@ static bool brcms_c_chipmatch_pci(struct
return false;
}
if (BRCMS_ISNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16);
else
-@@ -5676,6 +5676,8 @@ static bool brcms_c_chipmatch_soc(struct
+@@ -5675,6 +5675,8 @@ static bool brcms_c_chipmatch_soc(struct
if (chipinfo->id == BCMA_CHIP_ID_BCM4716)
return true;
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
-@@ -2923,7 +2923,7 @@ brcms_b_write_objmem(struct brcms_hardwa
+@@ -2922,7 +2922,7 @@ brcms_b_write_objmem(struct brcms_hardwa
if (offset & 2)
objoff += 2;