Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[pandora-kernel.git] / drivers / staging / rt2860 / chip / rtmp_mac.h

diff --git a/drivers/staging/rt2860/chip/rtmp_mac.h b/drivers/staging/rt2860/chip/rtmp_mac.h
index f6a7258..e8f7172 100644 (file)
--- a/drivers/staging/rt2860/chip/rtmp_mac.h
+++ b/drivers/staging/rt2860/chip/rtmp_mac.h
@@ -154,7 +154,7 @@ typedef union _INT_SOURCE_CSR_STRUC {
                u32 GPTimer:1;
                u32 RxCoherent:1;       /*bit16 */
                u32 TxCoherent:1;
-               u32 : 14;
+               u32: 14;
        } field;
        u32 word;
 } INT_SOURCE_CSR_STRUC, *PINT_SOURCE_CSR_STRUC;
@@ -175,7 +175,7 @@ typedef union _INT_MASK_CSR_STRUC {
                u32 HccaDmaDone:1;
                u32 MgmtDmaDone:1;
                u32 MCUCommandINT:1;
-               u32 : 20;
+               u32: 20;
                u32 RxCoherent:1;
                u32 TxCoherent:1;
        } field;
@@ -209,7 +209,7 @@ typedef union _WPDMA_RST_IDX_STRUC {
                u32 RST_DTX_IDX5:1;
                u32 rsv:10;
                u32 RST_DRX_IDX0:1;
-               u32 : 15;
+               u32: 15;
        } field;
        u32 word;
 } WPDMA_RST_IDX_STRUC, *PWPDMA_RST_IDX_STRUC;
@@ -448,7 +448,7 @@ typedef union _BBP_CSR_CFG_STRUC {
                u32 Busy:1;     /* 1: ASIC is busy execute BBP programming. */
                u32 BBP_PAR_DUR:1;      /* 0: 4 MAC clock cycles  1: 8 MAC clock cycles */
                u32 BBP_RW_MODE:1;      /* 0: use serial mode  1:parallel */
-               u32 : 12;
+               u32: 12;
        } field;
        u32 word;
 } BBP_CSR_CFG_STRUC, *PBBP_CSR_CFG_STRUC;
@@ -494,7 +494,7 @@ typedef union _LED_CFG_STRUC {
                u32 GLedMode:2; /* green Led Mode */
                u32 YLedMode:2; /* yellow Led Mode */
                u32 LedPolar:1; /* Led Polarity.  0: active low1: active high */
-               u32 : 1;
+               u32: 1;
        } field;
        u32 word;
 } LED_CFG_STRUC, *PLED_CFG_STRUC;
@@ -533,7 +533,7 @@ typedef union _BCN_TIME_CFG_STRUC {
                u32 TsfSyncMode:2;      /* Enable TSF sync, 00: disable, 01: infra mode, 10: ad-hoc mode */
                u32 bTBTTEnable:1;
                u32 bBeaconGen:1;       /* Enable beacon generator */
-               u32 : 3;
+               u32: 3;
                u32 TxTimestampCompensate:8;
        } field;
        u32 word;
@@ -560,7 +560,7 @@ typedef union _AUTO_WAKEUP_STRUC {
                u32 AutoLeadTime:8;
                u32 NumofSleepingTbtt:7;        /* ForceWake has high privilege than PutToSleep when both set */
                u32 EnableAutoWakeup:1; /* 0:sleep, 1:awake */
-               u32 : 16;
+               u32: 16;
        } field;
        u32 word;
 } AUTO_WAKEUP_STRUC, *PAUTO_WAKEUP_STRUC;
@@ -578,7 +578,7 @@ typedef union _EDCA_AC_CFG_STRUC {
                u32 Aifsn:4;    /* # of slot time */
                u32 Cwmin:4;    /* */
                u32 Cwmax:4;    /*unit power of 2 */
-               u32 : 12;       /* */
+               u32: 12;        /* */
        } field;
        u32 word;
 } EDCA_AC_CFG_STRUC, *PEDCA_AC_CFG_STRUC;
@@ -751,7 +751,7 @@ typedef union _AUTO_RSP_CFG_STRUC {
                u32 rsv:1;      /* Power bit value in conrtrol frame */
                u32 DualCTSEn:1;        /* Power bit value in conrtrol frame */
                u32 AckCtsPsmBit:1;     /* Power bit value in conrtrol frame */
-               u32 : 24;
+               u32: 24;
        } field;
        u32 word;
 } AUTO_RSP_CFG_STRUC, *PAUTO_RSP_CFG_STRUC;
@@ -981,21 +981,21 @@ typedef union _MPDU_DEN_CNT_STRUC {
 typedef union _SHAREDKEY_MODE_STRUC {
        struct {
                u32 Bss0Key0CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss0Key1CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss0Key2CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss0Key3CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss1Key0CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss1Key1CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss1Key2CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss1Key3CipherAlg:3;
-               u32 : 1;
+               u32: 1;
        } field;
        u32 word;
 } SHAREDKEY_MODE_STRUC, *PSHAREDKEY_MODE_STRUC;
@@ -1103,7 +1103,7 @@ typedef union _RX_FILTR_CFG_STRUC {
                u32 DropBAR:1;  /* */
 
                u32 DropRsvCntlType:1;
-               u32 : 15;
+               u32: 15;
        } field;
        u32 word;
 } RX_FILTR_CFG_STRUC, *PRX_FILTR_CFG_STRUC;
@@ -1128,21 +1128,21 @@ typedef union _PHY_CSR4_STRUC {
 typedef union _SEC_CSR5_STRUC {
        struct {
                u32 Bss2Key0CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss2Key1CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss2Key2CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss2Key3CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss3Key0CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss3Key1CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss3Key2CipherAlg:3;
-               u32 : 1;
+               u32: 1;
                u32 Bss3Key3CipherAlg:3;
-               u32 : 1;
+               u32: 1;
        } field;
        u32 word;
 } SEC_CSR5_STRUC, *PSEC_CSR5_STRUC;