linux-next: merge of the wireless-next tree into the net-next tree

Hi all,

I noticed that the wireless-next tree has been merged into the net-next
tree today.  Has anything been done about the build failure I reported in
the wireless-next a while ago:

On 12/22/2011 16:58 +1100, Stephen Rothwell wrote:

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
drivers/net/wireless/ath/ath6kl/cfg80211.c:27:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: 'KBUILD_MODNAME' undeclared here (not in a function)
drivers/net/wireless/ath/ath6kl/init.c:32:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: invalid initializer
drivers/net/wireless/ath/ath6kl/init.c:33:1: error: expected ',' or ';' before string constant
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: expected ')' before 'KBUILD_MODNAME'
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: invalid initializer
drivers/net/wireless/ath/ath6kl/init.c:34:1: error: expected ',' or ';' before string constant

I can't figure out what goes wrong here.  On the compile command line,
KBUILD_MODNAME is not defined, but KBUILD_BASE_NAME is.

However, reverting commit fde57764ef87 ("ath6kl: enable USB support")
made the problem go away.  That commit caused the above two files to be
built into two separate modules.

There was some discussion, but I did not notice any fix (I may have
missed it).  I have been reverting that above commit ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/