diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2013-04-04 15:41:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-04-08 15:28:38 -0400 |
commit | 9a84912c8f19b882ff20b8744c16bbf37484712f (patch) | |
tree | ca61aeeafaa4149d905950269aa4edb0253087b2 /drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h | |
parent | 07b72bf334fcc12f73816866eaa44de42ca9894c (diff) |
rtlwifi: rtl8188ee: Fix allyesconfig build failures
An allyesconfig build of rtl8188ee yields the following duplicate entry points:
drivers/net/wireless/rtlwifi/rtl8188ee/built-in.o: In function `.rtl92c_phy_ap_calibrate':
(.text+0x21d14): multiple definition of `.rtl92c_phy_ap_calibrate'
drivers/net/wireless/rtlwifi/rtl8192c/built-in.o:(.text+0xb1e8): first defined here
drivers/net/wireless/rtlwifi/rtl8188ee/built-in.o: In function `rtl_hal_pwrseqcmdparsing':
(.opd+0xed0): multiple definition of `rtl_hal_pwrseqcmdparsing'
One of the routines is not used and can be deleted, the other is renamed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h index 70456ab6526c..d9ae280bb1a2 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h | |||
@@ -90,8 +90,8 @@ struct wlan_pwr_cfg { | |||
90 | #define GET_PWR_CFG_MASK(__PWR) (__PWR.msk) | 90 | #define GET_PWR_CFG_MASK(__PWR) (__PWR.msk) |
91 | #define GET_PWR_CFG_VALUE(__PWR) (__PWR.value) | 91 | #define GET_PWR_CFG_VALUE(__PWR) (__PWR.value) |
92 | 92 | ||
93 | bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version, | 93 | bool rtl88_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version, |
94 | u8 fab_version, u8 interface_type, | 94 | u8 fab_version, u8 interface_type, |
95 | struct wlan_pwr_cfg pwrcfgcmd[]); | 95 | struct wlan_pwr_cfg pwrcfgcmd[]); |
96 | 96 | ||
97 | #endif | 97 | #endif |