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>
This commit is contained in:

committed by
John W. Linville

parent
8c6113cd03
commit
1472d3a875
@@ -3,6 +3,7 @@ config RTL8192CE
|
||||
depends on MAC80211 && PCI && EXPERIMENTAL
|
||||
select FW_LOADER
|
||||
select RTLWIFI
|
||||
select RTL8192C_COMMON
|
||||
---help---
|
||||
This is the driver for Realtek RTL8192CE/RTL8188CE 802.11n PCIe
|
||||
wireless network adapters.
|
||||
@@ -14,6 +15,7 @@ config RTL8192CU
|
||||
depends on MAC80211 && USB && EXPERIMENTAL
|
||||
select FW_LOADER
|
||||
select RTLWIFI
|
||||
select RTL8192C_COMMON
|
||||
---help---
|
||||
This is the driver for Realtek RTL8192CU/RTL8188CU 802.11n USB
|
||||
wireless network adapters.
|
||||
@@ -24,3 +26,8 @@ config RTLWIFI
|
||||
tristate
|
||||
depends on RTL8192CE || RTL8192CU
|
||||
default m
|
||||
|
||||
config RTL8192C_COMMON
|
||||
tristate
|
||||
depends on RTL8192CE || RTL8192CU
|
||||
default m
|
||||
|
Reference in New Issue
Block a user