forked from Minki/linux
staging: rtl8188eu: using unique names is good
fixes: drivers/staging/built-in.o:(.opd+0xaab8): multiple definition of `rtl88e_phy_rf_config' drivers/net/built-in.o:(.opd+0x78840): first defined here drivers/staging/built-in.o:(.opd+0xa9f8): multiple definition of `rtl88e_download_fw' drivers/net/built-in.o:(.opd+0x781b0): first defined here drivers/staging/built-in.o: In function `.rtl88e_phy_rf_config': (.text+0xe0a00): multiple definition of `.rtl88e_phy_rf_config' drivers/net/built-in.o:(.text+0xe85a48): first defined here drivers/staging/built-in.o: In function `.rtl88e_download_fw': (.text+0xdf28c): multiple definition of `.rtl88e_download_fw' drivers/net/built-in.o:(.text+0xe6f330): first defined here drivers/staging/built-in.o: In function `.rtl88e_phy_mac_config': (.text+0xdf984): multiple definition of `.rtl88e_phy_mac_config' drivers/net/built-in.o:(.text+0xe84a8c): first defined here drivers/staging/built-in.o: In function `.rtl88e_phy_bb_config': (.text+0xdfa2c): multiple definition of `.rtl88e_phy_bb_config' drivers/net/built-in.o:(.text+0xe84d14): first defined here drivers/staging/built-in.o:(.opd+0xaa58): multiple definition of `rtl88e_phy_bb_config' drivers/net/built-in.o:(.opd+0x78828): first defined here drivers/staging/built-in.o:(.opd+0xaa28): multiple definition of `rtl88e_phy_mac_config' Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9641723591
commit
90d88de82c
@ -687,7 +687,7 @@ static bool config_parafile(struct adapter *adapt)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool rtl88e_phy_bb_config(struct adapter *adapt)
|
||||
bool rtl88eu_phy_bb_config(struct adapter *adapt)
|
||||
{
|
||||
int rtstatus = true;
|
||||
struct hal_data_8188e *hal_data = GET_HAL_DATA(adapt);
|
||||
|
@ -117,7 +117,7 @@ static u32 array_MAC_REG_8188E[] = {
|
||||
0x70B, 0x00000087,
|
||||
};
|
||||
|
||||
bool rtl88e_phy_mac_config(struct adapter *adapt)
|
||||
bool rtl88eu_phy_mac_config(struct adapter *adapt)
|
||||
{
|
||||
u32 i;
|
||||
u32 arraylength;
|
||||
|
@ -312,7 +312,7 @@ static bool rtl88e_phy_rf6052_config(struct adapter *adapt)
|
||||
return rf6052_conf_para(adapt);
|
||||
}
|
||||
|
||||
bool rtl88e_phy_rf_config(struct adapter *adapt)
|
||||
bool rtl88eu_phy_rf_config(struct adapter *adapt)
|
||||
{
|
||||
return rtl88e_phy_rf6052_config(adapt);
|
||||
}
|
||||
|
@ -181,7 +181,7 @@ exit:
|
||||
return err;
|
||||
}
|
||||
|
||||
int rtl88e_download_fw(struct adapter *adapt)
|
||||
int rtl88eu_download_fw(struct adapter *adapt)
|
||||
{
|
||||
struct hal_data_8188e *rtlhal = GET_HAL_DATA(adapt);
|
||||
struct dvobj_priv *dvobj = adapter_to_dvobj(adapt);
|
||||
|
@ -743,7 +743,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
|
||||
Adapter->bFWReady = false;
|
||||
haldata->fw_ractrl = false;
|
||||
} else {
|
||||
status = rtl88e_download_fw(Adapter);
|
||||
status = rtl88eu_download_fw(Adapter);
|
||||
|
||||
if (status) {
|
||||
DBG_88E("%s: Download Firmware failed!!\n", __func__);
|
||||
@ -758,11 +758,11 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
|
||||
}
|
||||
rtl8188e_InitializeFirmwareVars(Adapter);
|
||||
|
||||
rtl88e_phy_mac_config(Adapter);
|
||||
rtl88eu_phy_mac_config(Adapter);
|
||||
|
||||
rtl88e_phy_bb_config(Adapter);
|
||||
rtl88eu_phy_bb_config(Adapter);
|
||||
|
||||
rtl88e_phy_rf_config(Adapter);
|
||||
rtl88eu_phy_rf_config(Adapter);
|
||||
|
||||
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH);
|
||||
status = rtl8188e_iol_efuse_patch(Adapter);
|
||||
|
@ -54,6 +54,6 @@ struct rtl92c_firmware_header {
|
||||
u32 rsvd5;
|
||||
};
|
||||
|
||||
int rtl88e_download_fw(struct adapter *adapt);
|
||||
int rtl88eu_download_fw(struct adapter *adapt);
|
||||
|
||||
#endif
|
||||
|
@ -1,3 +1,3 @@
|
||||
bool rtl88e_phy_mac_config(struct adapter *adapt);
|
||||
bool rtl88e_phy_rf_config(struct adapter *adapt);
|
||||
bool rtl88e_phy_bb_config(struct adapter *adapt);
|
||||
bool rtl88eu_phy_mac_config(struct adapter *adapt);
|
||||
bool rtl88eu_phy_rf_config(struct adapter *adapt);
|
||||
bool rtl88eu_phy_bb_config(struct adapter *adapt);
|
||||
|
Loading…
Reference in New Issue
Block a user