summaryrefslogtreecommitdiffstats
path: root/net/ieee80211/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-22 22:55:57 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-22 22:55:57 -0500
commitfa4fa40a990f8f4eff65476bef32007c154bbac0 (patch)
treec6e15822d1da2811ed004d3f8a4c72864adb5250 /net/ieee80211/Makefile
parentb7ad6d75028d021362221d9b2db19fcff995c3f8 (diff)
parentfe0b06b123762ab620b5bee3dab1576ddddd0a7f (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/ieee80211/Makefile')
-rw-r--r--net/ieee80211/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ieee80211/Makefile b/net/ieee80211/Makefile
index f988417121d..796a7c76ee4 100644
--- a/net/ieee80211/Makefile
+++ b/net/ieee80211/Makefile
@@ -10,3 +10,4 @@ ieee80211-objs := \
ieee80211_wx.o \
ieee80211_geo.o
+obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/