Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / net / ieee80211 / Makefile

diff --git a/net/ieee80211/Makefile b/net/ieee80211/Makefile
index 796a7c76ee4823176b324f47fc514f317ef04a58..f988417121da76646ad995ce3a556c09349b0338 100644 (file)
--- a/net/ieee80211/Makefile
+++ b/net/ieee80211/Makefile
@@ -10,4 +10,3 @@ ieee80211-objs := \
        ieee80211_wx.o \
        ieee80211_geo.o
 
-obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/