diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-02-23 11:24:58 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-23 16:28:41 -0500 |
commit | 1472d3a87586eb7529d1d85f7c888055650b7208 (patch) | |
tree | 89fa6dbd7a78e0a065b3b1db68abe9c03473c50e /drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | |
parent | 8c6113cd03c7e927f5ee5f6ad98e155ef2d27177 (diff) |
rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig build
As noted by Stephan Rothwell, an allyesconfig build fails since rtl8192cu
was merged with failures such as:
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_sw_chnl':
(.opd+0xf30): multiple definition of `rtl92c_phy_sw_chnl'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0xb70): first defined here
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_h2c_cmd':
(.opd+0x288): multiple definition of `rtl92c_fill_h2c_cmd'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0x288): first defined here
These are caused because the code shared between rtl8192ce and rtl8192cu
is included in both drivers. This has been fixed by creating a new modue that
contains the shared code.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/phy.h')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h index 3fc60e434cef..a37267e3fc22 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | |||
@@ -191,11 +191,11 @@ extern void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw, | |||
191 | extern u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw, | 191 | extern u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw, |
192 | enum radio_path rfpath, u32 regaddr, | 192 | enum radio_path rfpath, u32 regaddr, |
193 | u32 bitmask); | 193 | u32 bitmask); |
194 | extern void rtl92c_phy_set_rf_reg(struct ieee80211_hw *hw, | 194 | extern void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw, |
195 | enum radio_path rfpath, u32 regaddr, | 195 | enum radio_path rfpath, u32 regaddr, |
196 | u32 bitmask, u32 data); | 196 | u32 bitmask, u32 data); |
197 | extern bool rtl92c_phy_mac_config(struct ieee80211_hw *hw); | 197 | extern bool rtl92c_phy_mac_config(struct ieee80211_hw *hw); |
198 | extern bool rtl92c_phy_bb_config(struct ieee80211_hw *hw); | 198 | bool rtl92ce_phy_bb_config(struct ieee80211_hw *hw); |
199 | extern bool rtl92c_phy_rf_config(struct ieee80211_hw *hw); | 199 | extern bool rtl92c_phy_rf_config(struct ieee80211_hw *hw); |
200 | extern bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, | 200 | extern bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, |
201 | enum radio_path rfpath); | 201 | enum radio_path rfpath); |
@@ -223,12 +223,32 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, | |||
223 | extern bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw, | 223 | extern bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw, |
224 | u32 rfpath); | 224 | u32 rfpath); |
225 | bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); | 225 | bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); |
226 | extern bool rtl92c_phy_set_rf_power_state(struct ieee80211_hw *hw, | 226 | bool rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw, |
227 | enum rf_pwrstate rfpwr_state); | 227 | enum rf_pwrstate rfpwr_state); |
228 | void rtl92c_phy_config_bb_external_pa(struct ieee80211_hw *hw); | ||
229 | void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw); | 228 | void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw); |
230 | bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); | 229 | bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); |
231 | void rtl92c_phy_set_io(struct ieee80211_hw *hw); | 230 | void rtl92c_phy_set_io(struct ieee80211_hw *hw); |
232 | void rtl92c_bb_block_on(struct ieee80211_hw *hw); | 231 | void rtl92c_bb_block_on(struct ieee80211_hw *hw); |
232 | u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw, | ||
233 | enum radio_path rfpath, u32 offset); | ||
234 | u32 _rtl92c_phy_fw_rf_serial_read(struct ieee80211_hw *hw, | ||
235 | enum radio_path rfpath, u32 offset); | ||
236 | u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask); | ||
237 | void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw, | ||
238 | enum radio_path rfpath, u32 offset, | ||
239 | u32 data); | ||
240 | void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw, | ||
241 | u32 regaddr, u32 bitmask, | ||
242 | u32 data); | ||
243 | void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw, | ||
244 | enum radio_path rfpath, u32 offset, | ||
245 | u32 data); | ||
246 | void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw, | ||
247 | u32 regaddr, u32 bitmask, | ||
248 | u32 data); | ||
249 | bool _rtl92ce_phy_config_mac_with_headerfile(struct ieee80211_hw *hw); | ||
250 | void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw); | ||
251 | bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw); | ||
252 | void _rtl92c_phy_set_rf_sleep(struct ieee80211_hw *hw); | ||
233 | 253 | ||
234 | #endif | 254 | #endif |