aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-06-28 19:55:50 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-06-29 15:11:06 -0400
commitab049fbf5ea87fc92441fc5211c315d04a312cca (patch)
tree6f0c9df0a08fabcd38c11cb19432608165acc7bd /drivers/net/wireless/rtlwifi/rtl8192de/phy.c
parenta5f377fb9c9758b248773c5b8b1a20d4e7e2c982 (diff)
rtlwifi: rtl8192de: Fix build errors when using allyes configuration
After adding rtl8192de to linux-next, making the rtlwifi drivers be built-in results in the following warnings: LD drivers/net/wireless/rtlwifi/built-in.o drivers/net/wireless/rtlwifi/rtl8192de/built-in.o: In function `rtl92ce_sw_led_on': (.text+0x11fb6): multiple definition of `rtl92ce_sw_led_on' drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.text+0xa326): first defined here drivers/net/wireless/rtlwifi/rtl8192de/built-in.o:(.bss+0x0): multiple definition of `dm_digtable' drivers/net/wireless/rtlwifi/rtl8192c/built-in.o:(.bss+0x0): first defined here ld: Warning: size of symbol `dm_digtable' changed from 40 in drivers/net/wireless/rtlwifi/rtl8192c/built-in.o to 48 in drivers/net/wireless/rtlwifi/rtl8192de/built-in.o drivers/net/wireless/rtlwifi/rtl8192de/built-in.o: In function `rtl92ce_sw_led_off': (.text+0x11cfe): multiple definition of `rtl92ce_sw_led_off' drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.text+0xa06e): first defined here Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192de/phy.c')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192de/phy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 4d4c8ebc77ad..97fb6ca39d73 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -3192,13 +3192,13 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
3192 rtlphy->current_io_type, rtlphy->set_io_inprogress)); 3192 rtlphy->current_io_type, rtlphy->set_io_inprogress));
3193 switch (rtlphy->current_io_type) { 3193 switch (rtlphy->current_io_type) {
3194 case IO_CMD_RESUME_DM_BY_SCAN: 3194 case IO_CMD_RESUME_DM_BY_SCAN:
3195 dm_digtable.cur_igvalue = rtlphy->initgain_backup.xaagccore1; 3195 de_digtable.cur_igvalue = rtlphy->initgain_backup.xaagccore1;
3196 rtl92d_dm_write_dig(hw); 3196 rtl92d_dm_write_dig(hw);
3197 rtl92d_phy_set_txpower_level(hw, rtlphy->current_channel); 3197 rtl92d_phy_set_txpower_level(hw, rtlphy->current_channel);
3198 break; 3198 break;
3199 case IO_CMD_PAUSE_DM_BY_SCAN: 3199 case IO_CMD_PAUSE_DM_BY_SCAN:
3200 rtlphy->initgain_backup.xaagccore1 = dm_digtable.cur_igvalue; 3200 rtlphy->initgain_backup.xaagccore1 = de_digtable.cur_igvalue;
3201 dm_digtable.cur_igvalue = 0x17; 3201 de_digtable.cur_igvalue = 0x17;
3202 rtl92d_dm_write_dig(hw); 3202 rtl92d_dm_write_dig(hw);
3203 break; 3203 break;
3204 default: 3204 default: