---

yaml --- r: 219828 b: refs/heads/master c: 198bd4d h: refs/heads/master v: v3
git-mirror · Sep 14, 2010 · 1017f0e · 1017f0e
1 parent 93f9a9a
commit 1017f0e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39dcff3f45048df1c8bd3e3ba033e7b62328db3f
+refs/heads/master: 198bd4d69dddb3fe78fdc251983bb49502b3b35e
diff --git a/trunk/drivers/staging/brcm80211/include/d11.h b/trunk/drivers/staging/brcm80211/include/d11.h
@@ -1201,8 +1201,8 @@ BWL_PRE_PACKED_STRUCT struct tx_status {
 #define M_20IN40_IQ			(0x380 * 2)
 
 /* SHM locations where ucode stores the current power index */
-#define M_CURR_IDX1		(0x384 *2)
-#define M_CURR_IDX2		(0x387 *2)
+#define M_CURR_IDX1		(0x384 * 2)
+#define M_CURR_IDX2		(0x387 * 2)
 
 #define M_BSCALE_ANT0	(0x5e * 2)
 #define M_BSCALE_ANT1	(0x5f * 2)

diff --git a/trunk/drivers/staging/brcm80211/util/bcmsrom.c b/trunk/drivers/staging/brcm80211/util/bcmsrom.c
@@ -503,8 +503,8 @@ BCMATTACHFN(srom_parsecis) (osl_t *osh, uint8 *pcis[], uint ciscnt,
 					    && !(ETHER_ISMULTI(&cis[i + 2]))) {
 						ASSERT(cis[i + 1] ==
 						       ETHER_ADDR_LEN);
-						bcm_ether_ntoa((struct
-								ether_addr *)
+						bcm_ether_ntoa(
+							(struct ether_addr *)
 							       &cis[i + 2],
 							       eabuf);
 
@@ -975,8 +975,8 @@ BCMATTACHFN(srom_parsecis) (osl_t *osh, uint8 *pcis[], uint ciscnt,
 				case HNBU_MACADDR:
 					if (!(ETHER_ISNULLADDR(&cis[i + 1])) &&
 					    !(ETHER_ISMULTI(&cis[i + 1]))) {
-						bcm_ether_ntoa((struct
-								ether_addr *)
+						bcm_ether_ntoa(
+							(struct ether_addr *)
 							       &cis[i + 1],
 							       eabuf);