netns xfrm: fix "ip xfrm state|policy count" misreport

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

diff --git a/net/Makefile b/net/Makefile
index 4aa2f46..1542e72 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -15,8 +15,8 @@ obj-$(CONFIG_NET)             += $(tmp-y)
 # LLC has to be linked before the files in net/802/
 obj-$(CONFIG_LLC)              += llc/
 obj-$(CONFIG_NET)              += ethernet/ 802/ sched/ netlink/
-obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_NETFILTER)                += netfilter/
+obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_XFRM)             += xfrm/
 obj-$(CONFIG_UNIX)             += unix/
 ifneq ($(CONFIG_IPV6),)
@@ -24,8 +24,8 @@ 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/
 obj-$(CONFIG_ATALK)            += appletalk/
 obj-$(CONFIG_WAN_ROUTER)       += wanrouter/
@@ -34,18 +34,34 @@ obj-$(CONFIG_LAPB)          += lapb/
 obj-$(CONFIG_NETROM)           += netrom/
 obj-$(CONFIG_ROSE)             += rose/
 obj-$(CONFIG_AX25)             += ax25/
+obj-$(CONFIG_CAN)              += can/
 obj-$(CONFIG_IRDA)             += irda/
 obj-$(CONFIG_BT)               += bluetooth/
 obj-$(CONFIG_SUNRPC)           += sunrpc/
-obj-$(CONFIG_RXRPC)            += rxrpc/
+obj-$(CONFIG_AF_RXRPC)         += rxrpc/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_DECNET)           += decnet/
 obj-$(CONFIG_ECONET)           += econet/
-obj-$(CONFIG_VLAN_8021Q)       += 8021q/
+obj-$(CONFIG_PHONET)           += phonet/
+ifneq ($(CONFIG_VLAN_8021Q),)
+obj-y                          += 8021q/
+endif
 obj-$(CONFIG_IP_DCCP)          += dccp/
 obj-$(CONFIG_IP_SCTP)          += sctp/
-obj-$(CONFIG_IEEE80211)                += ieee80211/
+obj-$(CONFIG_RDS)              += rds/
+obj-y                          += wireless/
+obj-$(CONFIG_MAC80211)         += mac80211/
+obj-$(CONFIG_TIPC)             += tipc/
+obj-$(CONFIG_NETLABEL)         += netlabel/
+obj-$(CONFIG_IUCV)             += iucv/
+obj-$(CONFIG_RFKILL)           += rfkill/
+obj-$(CONFIG_NET_9P)           += 9p/
+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/