Merge branch 'linus' into cont_syslog

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

diff --git a/net/Makefile b/net/Makefile
index ba324ae..cb7bdc1 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/
@@ -41,6 +40,7 @@ obj-$(CONFIG_BT)              += bluetooth/
 obj-$(CONFIG_SUNRPC)           += sunrpc/
 obj-$(CONFIG_AF_RXRPC)         += rxrpc/
 obj-$(CONFIG_ATM)              += atm/
+obj-$(CONFIG_L2TP)             += l2tp/
 obj-$(CONFIG_DECNET)           += decnet/
 obj-$(CONFIG_ECONET)           += econet/
 obj-$(CONFIG_PHONET)           += phonet/
@@ -57,6 +57,7 @@ obj-$(CONFIG_NETLABEL)                += netlabel/
 obj-$(CONFIG_IUCV)             += iucv/
 obj-$(CONFIG_RFKILL)           += rfkill/
 obj-$(CONFIG_NET_9P)           += 9p/
+obj-$(CONFIG_CAIF)             += caif/
 ifneq ($(CONFIG_DCB),)
 obj-y                          += dcb/
 endif