Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index 092116e390b67f8c093a8fe2484aabffd3bd33f5..d2d848d445f211001a919875fc4265e5ebfac4f7 100644 (file)
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -1,4 +1,6 @@
 obj-$(CONFIG_WIRELESS_EXT) += wext.o
 obj-$(CONFIG_CFG80211) += cfg80211.o
+obj-$(CONFIG_LIB80211) += lib80211.o
 
-cfg80211-y += core.o sysfs.o radiotap.o
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o
+cfg80211-$(CONFIG_NL80211) += nl80211.o