rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig build
authorLarry Finger <Larry.Finger@lwfinger.net>
Wed, 23 Feb 2011 16:24:58 +0000 (10:24 -0600)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Feb 2011 21:28:41 +0000 (16:28 -0500)
commit1472d3a87586eb7529d1d85f7c888055650b7208
tree89fa6dbd7a78e0a065b3b1db68abe9c03473c50e
parent8c6113cd03c7e927f5ee5f6ad98e155ef2d27177
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>
34 files changed:
drivers/net/wireless/rtlwifi/Kconfig
drivers/net/wireless/rtlwifi/Makefile
drivers/net/wireless/rtlwifi/rtl8192c/Makefile [new file with mode: 0644]
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h [new file with mode: 0644]
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c [moved from drivers/net/wireless/rtlwifi/rtl8192ce/fw.c with 98% similarity]
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h [moved from drivers/net/wireless/rtlwifi/rtl8192ce/fw.h with 100% similarity]
drivers/net/wireless/rtlwifi/rtl8192c/main.c [moved from drivers/net/wireless/rtlwifi/rtl8192cu/fw.c with 75% similarity]
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h [new file with mode: 0644]
drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
drivers/net/wireless/rtlwifi/rtl8192cu/Makefile
drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
drivers/net/wireless/rtlwifi/rtl8192cu/dm.h
drivers/net/wireless/rtlwifi/rtl8192cu/fw.h [deleted file]
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
drivers/net/wireless/rtlwifi/rtl8192cu/phy.h
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
drivers/net/wireless/rtlwifi/wifi.h