diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-02-24 14:39:05 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-24 17:13:37 -0500 |
commit | 41cae2d01385af4199666db57274c0df3283b065 (patch) | |
tree | f84ee7c0bb5e6032ff01675771dae1dd439da9ad /drivers | |
parent | 1472d3a87586eb7529d1d85f7c888055650b7208 (diff) |
rtl8192c: fix compilation errors
On my G5 this fails to compile with
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:701: error: __ksymtab__rtl92c_phy_txpwr_idx_to_dbm causes a section type conflict
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:701: error: __ksymtab__rtl92c_phy_txpwr_idx_to_dbm causes a section type conflict
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:677: error: __ksymtab__rtl92c_phy_dbm_to_txpwr_Idx causes a section type conflict
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:677: error: __ksymtab__rtl92c_phy_dbm_to_txpwr_Idx causes a section type conflict
since you can't export static functions.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 12 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c index 30e3ef8badee..a70228278398 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | |||
@@ -644,9 +644,9 @@ void rtl92c_phy_set_beacon_hw_reg(struct ieee80211_hw *hw, u16 beaconinterval) | |||
644 | } | 644 | } |
645 | EXPORT_SYMBOL(rtl92c_phy_set_beacon_hw_reg); | 645 | EXPORT_SYMBOL(rtl92c_phy_set_beacon_hw_reg); |
646 | 646 | ||
647 | static u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, | 647 | u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, |
648 | enum wireless_mode wirelessmode, | 648 | enum wireless_mode wirelessmode, |
649 | long power_indbm) | 649 | long power_indbm) |
650 | { | 650 | { |
651 | u8 txpwridx; | 651 | u8 txpwridx; |
652 | long offset; | 652 | long offset; |
@@ -676,9 +676,9 @@ static u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, | |||
676 | } | 676 | } |
677 | EXPORT_SYMBOL(_rtl92c_phy_dbm_to_txpwr_Idx); | 677 | EXPORT_SYMBOL(_rtl92c_phy_dbm_to_txpwr_Idx); |
678 | 678 | ||
679 | static long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw, | 679 | long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw, |
680 | enum wireless_mode wirelessmode, | 680 | enum wireless_mode wirelessmode, |
681 | u8 txpwridx) | 681 | u8 txpwridx) |
682 | { | 682 | { |
683 | long offset; | 683 | long offset; |
684 | long pwrout_dbm; | 684 | long pwrout_dbm; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h index 148bc019f4bd..53ffb0981586 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h +++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | |||
@@ -228,12 +228,12 @@ void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw); | |||
228 | void rtl92c_phy_set_io(struct ieee80211_hw *hw); | 228 | void rtl92c_phy_set_io(struct ieee80211_hw *hw); |
229 | void rtl92c_bb_block_on(struct ieee80211_hw *hw); | 229 | void rtl92c_bb_block_on(struct ieee80211_hw *hw); |
230 | u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask); | 230 | u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask); |
231 | static long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw, | 231 | long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw, |
232 | enum wireless_mode wirelessmode, | 232 | enum wireless_mode wirelessmode, |
233 | u8 txpwridx); | 233 | u8 txpwridx); |
234 | static u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, | 234 | u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw, |
235 | enum wireless_mode wirelessmode, | 235 | enum wireless_mode wirelessmode, |
236 | long power_indbm); | 236 | long power_indbm); |
237 | void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw); | 237 | void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw); |
238 | static bool _rtl92c_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable, | 238 | static bool _rtl92c_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable, |
239 | u32 cmdtableidx, u32 cmdtablesz, | 239 | u32 cmdtableidx, u32 cmdtablesz, |