From: Johannes Berg <johannes.berg@xxxxxxxxx> If only 3945 is selected, and is a module, build fails because iwl-legacy.c won't be compiled. Fix this by adding it to the build correctly. This doesn't happen for 4965 because it is a bool option, not tristate, since it's built into the AGN module. Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Tested-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- drivers/net/wireless/iwlwifi/Makefile | 4 ++++ 1 file changed, 4 insertions(+) --- wireless-testing.orig/drivers/net/wireless/iwlwifi/Makefile 2010-11-18 12:04:47.000000000 -0800 +++ wireless-testing/drivers/net/wireless/iwlwifi/Makefile 2010-11-18 12:05:27.000000000 -0800 @@ -7,6 +7,10 @@ iwlcore-$(CONFIG_IWL4965) += iwl-legacy. iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o +# If 3945 is selected only, iwl-legacy.o will be added +# to iwlcore-m above, but it needs to be built in. +iwlcore-objs += $(iwlcore-m) + CFLAGS_iwl-devtrace.o := -I$(src) # AGN -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
