diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 13:46:58 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 13:48:06 -0600 |
| commit | 2dd22997679a88874c131f6e6ffb963e6d43b3a6 (patch) | |
| tree | bfe1707dda7e755b8b550c6796e2649813bcfbb9 /drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | |
| parent | 36885ff0e6563687e6152da6d311abbf83c0198f (diff) | |
| parent | 7b7adc4a016a1decb806eb71ecab98721fa7f146 (diff) | |
Merge remote-tracking branch 'origin' into spi/next
Pull in Linus' tree to pick up changes required for the langwell gpio fixes
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/rf.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h index d3014f99bb7..3aa520c1c17 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h @@ -40,5 +40,8 @@ extern void rtl92c_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw, u8 *ppowerlevel); extern void rtl92c_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw, u8 *ppowerlevel, u8 channel); -extern bool rtl92c_phy_rf6052_config(struct ieee80211_hw *hw); +bool rtl92ce_phy_rf6052_config(struct ieee80211_hw *hw); +bool rtl92ce_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, + enum radio_path rfpath); + #endif |