diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 11:13:03 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 11:13:03 +0400 |
| commit | fcb06702f023a0e7b1e6ebf9746f34b610ca0508 (patch) | |
| tree | db022324c4978dd9af059be38822d23455a45f55 /net/wireless/Makefile | |
| parent | 5e31fc0815a4e2c72b1b495fe7a0d8f9bfb9e4b4 (diff) | |
| parent | 9dbf5f55f8d35ff9aedc75267f4e4042aaf89755 (diff) | |
| download | linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.tar.xz | |
Merge remote-tracking branch 'wireless/master' into mac80211
Diffstat (limited to 'net/wireless/Makefile')
| -rw-r--r-- | net/wireless/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/Makefile b/net/wireless/Makefile index 55a28ab21db9..0f7e0d621ab0 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_WEXT_SPY) += wext-spy.o obj-$(CONFIG_WEXT_PRIV) += wext-priv.o cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o -cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o +cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o cfg80211-$(CONFIG_CFG80211_INTERNAL_REGDB) += regdb.o |