Merge branch 'upstream-fixes' into upstream

[powerpc.git] / net / ieee80211 / softmac / Makefile

diff --git a/net/ieee80211/softmac/Makefile b/net/ieee80211/softmac/Makefile
index d8c416b..bfcb391 100644 (file)
--- a/net/ieee80211/softmac/Makefile
+++ b/net/ieee80211/softmac/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_IEEE80211_SOFTMAC) := ieee80211softmac.o
+obj-$(CONFIG_IEEE80211_SOFTMAC) += ieee80211softmac.o
 ieee80211softmac-objs := \
                        ieee80211softmac_io.o \
                        ieee80211softmac_auth.o \