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/sw.c | |
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/sw.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c index b4df0b332832..b1cc4d44f534 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "phy.h" | 37 | #include "phy.h" |
38 | #include "dm.h" | 38 | #include "dm.h" |
39 | #include "hw.h" | 39 | #include "hw.h" |
40 | #include "rf.h" | ||
40 | #include "sw.h" | 41 | #include "sw.h" |
41 | #include "trx.h" | 42 | #include "trx.h" |
42 | #include "led.h" | 43 | #include "led.h" |
@@ -122,7 +123,7 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { | |||
122 | .switch_channel = rtl92c_phy_sw_chnl, | 123 | .switch_channel = rtl92c_phy_sw_chnl, |
123 | .dm_watchdog = rtl92c_dm_watchdog, | 124 | .dm_watchdog = rtl92c_dm_watchdog, |
124 | .scan_operation_backup = rtl92c_phy_scan_operation_backup, | 125 | .scan_operation_backup = rtl92c_phy_scan_operation_backup, |
125 | .set_rf_power_state = rtl92c_phy_set_rf_power_state, | 126 | .set_rf_power_state = rtl92ce_phy_set_rf_power_state, |
126 | .led_control = rtl92ce_led_control, | 127 | .led_control = rtl92ce_led_control, |
127 | .set_desc = rtl92ce_set_desc, | 128 | .set_desc = rtl92ce_set_desc, |
128 | .get_desc = rtl92ce_get_desc, | 129 | .get_desc = rtl92ce_get_desc, |
@@ -133,9 +134,17 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { | |||
133 | .deinit_sw_leds = rtl92ce_deinit_sw_leds, | 134 | .deinit_sw_leds = rtl92ce_deinit_sw_leds, |
134 | .get_bbreg = rtl92c_phy_query_bb_reg, | 135 | .get_bbreg = rtl92c_phy_query_bb_reg, |
135 | .set_bbreg = rtl92c_phy_set_bb_reg, | 136 | .set_bbreg = rtl92c_phy_set_bb_reg, |
136 | .get_rfreg = rtl92c_phy_query_rf_reg, | 137 | .get_rfreg = rtl92ce_phy_query_rf_reg, |
137 | .set_rfreg = rtl92c_phy_set_rf_reg, | 138 | .set_rfreg = rtl92ce_phy_set_rf_reg, |
138 | .cmd_send_packet = _rtl92c_cmd_send_packet, | 139 | .cmd_send_packet = _rtl92c_cmd_send_packet, |
140 | .phy_rf6052_config = rtl92ce_phy_rf6052_config, | ||
141 | .phy_rf6052_set_cck_txpower = rtl92ce_phy_rf6052_set_cck_txpower, | ||
142 | .phy_rf6052_set_ofdm_txpower = rtl92ce_phy_rf6052_set_ofdm_txpower, | ||
143 | .config_bb_with_headerfile = _rtl92ce_phy_config_bb_with_headerfile, | ||
144 | .config_bb_with_pgheaderfile = _rtl92ce_phy_config_bb_with_pgheaderfile, | ||
145 | .phy_lc_calibrate = _rtl92ce_phy_lc_calibrate, | ||
146 | .phy_set_bw_mode_callback = rtl92ce_phy_set_bw_mode_callback, | ||
147 | .dm_dynamic_txpower = rtl92ce_dm_dynamic_txpower, | ||
139 | }; | 148 | }; |
140 | 149 | ||
141 | static struct rtl_mod_params rtl92ce_mod_params = { | 150 | static struct rtl_mod_params rtl92ce_mod_params = { |