nfsd4: simplify lease/grace interaction

[safe/jmp/linux-2.6] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index e5af3dc..1542e72 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -24,7 +24,6 @@ obj-y                         += ipv6/
 endif
 obj-$(CONFIG_PACKET)           += packet/
 obj-$(CONFIG_NET_KEY)          += key/
-obj-$(CONFIG_NET_SCHED)                += sched/
 obj-$(CONFIG_BRIDGE)           += bridge/
 obj-$(CONFIG_NET_DSA)          += dsa/
 obj-$(CONFIG_IPX)              += ipx/
@@ -49,6 +48,7 @@ obj-y                         += 8021q/
 endif
 obj-$(CONFIG_IP_DCCP)          += dccp/
 obj-$(CONFIG_IP_SCTP)          += sctp/
+obj-$(CONFIG_RDS)              += rds/
 obj-y                          += wireless/
 obj-$(CONFIG_MAC80211)         += mac80211/
 obj-$(CONFIG_TIPC)             += tipc/
@@ -56,10 +56,12 @@ obj-$(CONFIG_NETLABEL)              += netlabel/
 obj-$(CONFIG_IUCV)             += iucv/
 obj-$(CONFIG_RFKILL)           += rfkill/
 obj-$(CONFIG_NET_9P)           += 9p/
-ifeq ($(CONFIG_DCBNL),y)
-obj-$(CONFIG_DCB)              += dcb/
+ifneq ($(CONFIG_DCB),)
+obj-y                          += dcb/
 endif
+obj-y                          += ieee802154/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o
 endif
+obj-$(CONFIG_WIMAX)            += wimax/