diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/mac80211/Makefile | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/mac80211/Makefile')
| -rw-r--r-- | net/mac80211/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile index 9f3cf7129324..04420291e7ad 100644 --- a/net/mac80211/Makefile +++ b/net/mac80211/Makefile | |||
| @@ -2,14 +2,14 @@ obj-$(CONFIG_MAC80211) += mac80211.o | |||
| 2 | 2 | ||
| 3 | # mac80211 objects | 3 | # mac80211 objects |
| 4 | mac80211-y := \ | 4 | mac80211-y := \ |
| 5 | main.o \ | 5 | main.o status.o \ |
| 6 | sta_info.o \ | 6 | sta_info.o \ |
| 7 | wep.o \ | 7 | wep.o \ |
| 8 | wpa.o \ | 8 | wpa.o \ |
| 9 | scan.o \ | 9 | scan.o offchannel.o \ |
| 10 | ht.o agg-tx.o agg-rx.o \ | 10 | ht.o agg-tx.o agg-rx.o \ |
| 11 | ibss.o \ | 11 | ibss.o \ |
| 12 | mlme.o \ | 12 | mlme.o work.o \ |
| 13 | iface.o \ | 13 | iface.o \ |
| 14 | rate.o \ | 14 | rate.o \ |
| 15 | michael.o \ | 15 | michael.o \ |