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

[linux-2.6-block.git] / net / wireless / Makefile

diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index 092116e390b67f8c093a8fe2484aabffd3bd33f5..65710a42e5a7890365b4478518653685ebe8e769 100644 (file)
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o
 obj-$(CONFIG_CFG80211) += cfg80211.o
 
 cfg80211-y += core.o sysfs.o radiotap.o
+cfg80211-$(CONFIG_NL80211) += nl80211.o