projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[cascardo/linux.git]
/
net
/
mac80211
/
Makefile
diff --git
a/net/mac80211/Makefile
b/net/mac80211/Makefile
index
a7dd110
..
9d7d840
100644
(file)
--- a/
net/mac80211/Makefile
+++ b/
net/mac80211/Makefile
@@
-8,6
+8,7
@@
mac80211-y := \
wpa.o \
scan.o offchannel.o \
ht.o agg-tx.o agg-rx.o \
+ vht.o \
ibss.o \
iface.o \
rate.o \
@@
-38,7
+39,8
@@
mac80211-$(CONFIG_MAC80211_MESH) += \
mesh_pathtbl.o \
mesh_plink.o \
mesh_hwmp.o \
- mesh_sync.o
+ mesh_sync.o \
+ mesh_ps.o
mac80211-$(CONFIG_PM) += pm.o