diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-06 15:46:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-06 15:46:08 -0500 |
| commit | 28c0f02ffe8a614bc7e1aa57319a62e7ce700d04 (patch) | |
| tree | 078ee8553662a5f6d82d31859c160ceab866c2d6 /drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | |
| parent | 89650ad0047f039b3c3bc0f6a5823bb9c9738152 (diff) | |
| parent | 1ca2760fb2c13959fcba794695cd5b306cbfa6a4 (diff) | |
Merge tag 'wireless-drivers-next-for-davem-2015-03-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Major changes:
brcmfmac:
* sdio improvements
* add a debugfs file so users can provide us all the revinfo we could
ask for
iwlwifi:
* add triggers for firmware dump collection
* remove support for -9.ucode
* new statitics API
* rate control improvements
ath9k:
* add per-vif TX power capability
* BT coexistance fixes
ath10k:
* qca6174: enable STA transmit beamforming (TxBF) support
* disable multi-vif power save by default
bcma:
* enable support for PCIe Gen 2 host devices
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192cu/rf.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h index 11b439d6b671..6f987de5b441 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #define __RTL92CU_RF_H__ | 31 | #define __RTL92CU_RF_H__ |
| 32 | 32 | ||
| 33 | #define RF6052_MAX_TX_PWR 0x3F | 33 | #define RF6052_MAX_TX_PWR 0x3F |
| 34 | #define RF6052_MAX_REG 0x3F | ||
| 35 | #define RF6052_MAX_PATH 2 | 34 | #define RF6052_MAX_PATH 2 |
| 36 | 35 | ||
| 37 | void rtl92cu_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth); | 36 | void rtl92cu_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth); |