aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/brcm80211/include/d11.h4
-rw-r--r--drivers/staging/brcm80211/util/bcmsrom.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/brcm80211/include/d11.h b/drivers/staging/brcm80211/include/d11.h
index 3dbd54c0cc7..f17ea8cba07 100644
--- a/drivers/staging/brcm80211/include/d11.h
+++ b/drivers/staging/brcm80211/include/d11.h
@@ -1201,8 +1201,8 @@ BWL_PRE_PACKED_STRUCT struct tx_status {
1201#define M_20IN40_IQ (0x380 * 2) 1201#define M_20IN40_IQ (0x380 * 2)
1202 1202
1203/* SHM locations where ucode stores the current power index */ 1203/* SHM locations where ucode stores the current power index */
1204#define M_CURR_IDX1 (0x384 *2) 1204#define M_CURR_IDX1 (0x384 * 2)
1205#define M_CURR_IDX2 (0x387 *2) 1205#define M_CURR_IDX2 (0x387 * 2)
1206 1206
1207#define M_BSCALE_ANT0 (0x5e * 2) 1207#define M_BSCALE_ANT0 (0x5e * 2)
1208#define M_BSCALE_ANT1 (0x5f * 2) 1208#define M_BSCALE_ANT1 (0x5f * 2)
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c
index 361dc112626..a295ecb9320 100644
--- a/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/drivers/staging/brcm80211/util/bcmsrom.c
@@ -503,8 +503,8 @@ BCMATTACHFN(srom_parsecis) (osl_t *osh, uint8 *pcis[], uint ciscnt,
503 && !(ETHER_ISMULTI(&cis[i + 2]))) { 503 && !(ETHER_ISMULTI(&cis[i + 2]))) {
504 ASSERT(cis[i + 1] == 504 ASSERT(cis[i + 1] ==
505 ETHER_ADDR_LEN); 505 ETHER_ADDR_LEN);
506 bcm_ether_ntoa((struct 506 bcm_ether_ntoa(
507 ether_addr *) 507 (struct ether_addr *)
508 &cis[i + 2], 508 &cis[i + 2],
509 eabuf); 509 eabuf);
510 510
@@ -975,8 +975,8 @@ BCMATTACHFN(srom_parsecis) (osl_t *osh, uint8 *pcis[], uint ciscnt,
975 case HNBU_MACADDR: 975 case HNBU_MACADDR:
976 if (!(ETHER_ISNULLADDR(&cis[i + 1])) && 976 if (!(ETHER_ISNULLADDR(&cis[i + 1])) &&
977 !(ETHER_ISMULTI(&cis[i + 1]))) { 977 !(ETHER_ISMULTI(&cis[i + 1]))) {
978 bcm_ether_ntoa((struct 978 bcm_ether_ntoa(
979 ether_addr *) 979 (struct ether_addr *)
980 &cis[i + 1], 980 &cis[i + 1],
981 eabuf); 981 eabuf);
982 982