aboutsummaryrefslogtreecommitdiff
path: root/net/wireless/Makefile
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2009-03-12 09:20:40 -0700
committerJohn W. Linville <linville@tuxdriver.com>2009-03-27 20:12:42 -0400
commit633e24ed95b6c87b42f201ecb65c12a75a5a7eef (patch)
tree240a4682071162cf5b8c8a16a654118f989c2a39 /net/wireless/Makefile
parentfa56dddd6720c8d4b9fa4c942377d2a019cf3708 (diff)
downloadlinux-633e24ed95b6c87b42f201ecb65c12a75a5a7eef.tar.gz
cfg80211/nl80211: remove usage of CONFIG_NL80211
The scan capability added to cfg80211/nl80211 introduced a dependency on nl80211 by cfg80211. We can thus no longer have just cfg80211 without nl80211. Specifically, cfg80211_scan_done() calls nl80211_send_scan_aborted() or nl80211_send_scan_done(). Now we remove the option for user to select nl80211. It will always be compiled if user selects cfg80211. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/Makefile')
-rw-r--r--net/wireless/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index dad43c24f69..c157b4d8014 100644
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -5,8 +5,7 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
-cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o
-cfg80211-$(CONFIG_NL80211) += nl80211.o
ccflags-y += -D__CHECK_ENDIAN__