projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6-block.git]
/
net
/
wireless
/
Makefile
diff --git
a/net/wireless/Makefile
b/net/wireless/Makefile
index 3a96ae60271cf1d79641d6ef155b472cf7889e96..65710a42e5a7890365b4478518653685ebe8e769 100644
(file)
--- a/
net/wireless/Makefile
+++ b/
net/wireless/Makefile
@@
-1,4
+1,5
@@
obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o
-cfg80211-y += core.o sysfs.o
+cfg80211-y += core.o sysfs.o radiotap.o
+cfg80211-$(CONFIG_NL80211) += nl80211.o