Re: pull request: wireless-next-2.6 2011-02-22
From: John W. Linville <hidden>
Date: 2011-03-04 18:40:50
Also in:
linux-wireless
Possibly related (same subject, not in this thread)
- 2011-03-04 · Re: pull request: wireless-next-2.6 2011-02-22 · Shan Wei <hidden>
- 2011-02-26 · Re: pull request: wireless-next-2.6 2011-02-22 · Gustavo F. Padovan <hidden>
- 2011-02-25 · Re: pull request: wireless-next-2.6 2011-02-22 · John W. Linville <hidden>
- 2011-02-25 · Re: pull request: wireless-next-2.6 2011-02-22 · Gustavo F. Padovan <hidden>
- 2011-02-25 · Re: pull request: wireless-next-2.6 2011-02-22 · David Miller <davem@davemloft.net>
On Fri, Mar 04, 2011 at 12:35:58PM +0800, Shan Wei wrote:
John W. Linville wrote, at 02/23/2011 05:52 AM:quoted
Please let me know if there are problems!Fail to compile with attached config under net-next tree. ======Error Begin================================================================ drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_sw_chnl': /data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:803: multiple definition of `rtl92c_phy_sw_chnl' drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:803: first defined here drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_h2c_cmd':
This is already fixed in wireless-next-2.6:
commit 1472d3a87586eb7529d1d85f7c888055650b7208
Author: Larry Finger [off-list ref]
Date: Wed Feb 23 10:24:58 2011 -0600
rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig buil
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_s
(.opd+0xf30): multiple definition of `rtl92c_phy_sw_chnl'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0xb70): first define
drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_
(.opd+0x288): multiple definition of `rtl92c_fill_h2c_cmd'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0x288): first define
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 tha
contains the shared code.
Signed-off-by: Larry Finger [off-list ref]
Signed-off-by: John W. Linville [off-list ref]
It will be in my next pull request to Dave.
John
--
John W. Linville Someday the world will need a hero, and you
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html