summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-06-27 00:00:25 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-29 15:32:43 -0700
commitd1e316891693f3e7266a1df9afda72763248ef7c (patch)
tree5669b68f6384153b986f85795f742ac190e53ebd /net
parent346fe763d7706cccdf90ba24f04f0facdd79b91a (diff)
downloadlinux-d1e316891693f3e7266a1df9afda72763248ef7c.tar.gz
linux-d1e316891693f3e7266a1df9afda72763248ef7c.tar.bz2
linux-d1e316891693f3e7266a1df9afda72763248ef7c.zip
net/Makefile: conditionally descend to wireless and ieee802154
Don't descend to wireless and ieee802154 unless they are actually used. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/Makefile b/net/Makefile
index cb7bdc1210cb..41d420070a38 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -50,7 +50,7 @@ endif
obj-$(CONFIG_IP_DCCP) += dccp/
obj-$(CONFIG_IP_SCTP) += sctp/
obj-$(CONFIG_RDS) += rds/
-obj-y += wireless/
+obj-$(CONFIG_WIRELESS) += wireless/
obj-$(CONFIG_MAC80211) += mac80211/
obj-$(CONFIG_TIPC) += tipc/
obj-$(CONFIG_NETLABEL) += netlabel/
@@ -61,7 +61,7 @@ obj-$(CONFIG_CAIF) += caif/
ifneq ($(CONFIG_DCB),)
obj-y += dcb/
endif
-obj-y += ieee802154/
+obj-$(CONFIG_IEEE802154) += ieee802154/
ifeq ($(CONFIG_NET),y)
obj-$(CONFIG_SYSCTL) += sysctl_net.o