diff options
author | 2011-09-07 14:18:36 -0700 | |
---|---|---|
committer | 2011-09-07 14:18:36 -0700 | |
commit | 7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch) | |
tree | 56b0d5f9d16eb18744e102f3f216715196cd62e6 /drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | |
parent | Input: tsc2007 - add open and close methods (diff) | |
parent | Linux 3.1-rc4 (diff) | |
download | linux-dev-7e66eaf14e19c032433be7c4df3c892fa2a5282f.tar.xz linux-dev-7e66eaf14e19c032433be7c4df3c892fa2a5282f.zip |
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/reg.h')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h index 598cecc63f41..ba5ff0411f0a 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h @@ -1074,10 +1074,10 @@ #define _SRL(x) (((x) & 0x3F) << 8) #define _SIFS_CCK_CTX(x) ((x) & 0xFF) -#define _SIFS_CCK_TRX(x) (((x) & 0xFF) << 8); +#define _SIFS_CCK_TRX(x) (((x) & 0xFF) << 8) #define _SIFS_OFDM_CTX(x) ((x) & 0xFF) -#define _SIFS_OFDM_TRX(x) (((x) & 0xFF) << 8); +#define _SIFS_OFDM_TRX(x) (((x) & 0xFF) << 8) #define _TBTT_PROHIBIT_HOLD(x) (((x) & 0xFF) << 8) @@ -1203,7 +1203,9 @@ #define EPROM_CMD_CONFIG 0x3 #define EPROM_CMD_LOAD 1 +#define HWSET_MAX_SIZE 128 #define HWSET_MAX_SIZE_92S HWSET_MAX_SIZE +#define EFUSE_MAX_SECTION 16 #define WL_HWPDN_EN BIT(0) |