diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-22 04:05:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-22 04:05:11 +0300 |
| commit | 6c0bce37ffc8f000a516fadf6dee84579c4c8f9b (patch) | |
| tree | 273af34d6f777b1ecb0fce7b2685e868064e6cf9 /net/wireless/Makefile | |
| parent | e243455d345ef62751723671bc2605a2f6032ceb (diff) | |
| parent | a1eb5fe319beb9e181aa52c8adf75ad9aab56a89 (diff) | |
| download | linux-6c0bce37ffc8f000a516fadf6dee84579c4c8f9b.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/Makefile')
| -rw-r--r-- | net/wireless/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/Makefile b/net/wireless/Makefile index d2d848d445f2..cc547edb111f 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -1,6 +1,9 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o obj-$(CONFIG_LIB80211) += lib80211.o +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 cfg80211-$(CONFIG_NL80211) += nl80211.o |