From c3540b050a2446b784e75b5c3d314007e8284d5b Mon Sep 17 00:00:00 2001 From: Nicolas Kaiser Date: Sun, 27 Jun 2010 00:00:25 +0000 Subject: [PATCH] --- yaml --- r: 203220 b: refs/heads/master c: d1e316891693f3e7266a1df9afda72763248ef7c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 048bb704c80f..83896eff2966 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 346fe763d7706cccdf90ba24f04f0facdd79b91a +refs/heads/master: d1e316891693f3e7266a1df9afda72763248ef7c diff --git a/trunk/net/Makefile b/trunk/net/Makefile index cb7bdc1210cb..41d420070a38 100644 --- a/trunk/net/Makefile +++ b/trunk/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