diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-18 21:21:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-18 21:21:44 -0400 |
| commit | d083450939dcfdc9f0e791e98478bd6d8ff80eea (patch) | |
| tree | e753318f8c09f58e2e2a63eedaf5ae8d6beaf615 /net/mac80211/Makefile | |
| parent | 2dbba6f773d1e1e4c78f03b0dbf19790d9017693 (diff) | |
| parent | cfb7267aaba2b59374d7bc765f038698711b09d8 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/Makefile')
| -rw-r--r-- | net/mac80211/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile index e9738dad2d7c..a9c2d0787d4a 100644 --- a/net/mac80211/Makefile +++ b/net/mac80211/Makefile | |||
| @@ -13,6 +13,7 @@ mac80211-objs := \ | |||
| 13 | ieee80211_iface.o \ | 13 | ieee80211_iface.o \ |
| 14 | ieee80211_rate.o \ | 14 | ieee80211_rate.o \ |
| 15 | michael.o \ | 15 | michael.o \ |
| 16 | regdomain.o \ | ||
| 16 | tkip.o \ | 17 | tkip.o \ |
| 17 | aes_ccm.o \ | 18 | aes_ccm.o \ |
| 18 | wme.o \ | 19 | wme.o \ |