Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[firefly-linux-kernel-4.4.55.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index e050d9d205e7e337b86da4ef69a777c9b273b78c..091e7b04f301539036dca468d045d0615a33f4b4 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -19,14 +19,13 @@ obj-$(CONFIG_NETFILTER)             += netfilter/
 obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_XFRM)             += xfrm/
 obj-$(CONFIG_UNIX)             += unix/
-obj-$(CONFIG_INET)             += ipv6/
+obj-$(CONFIG_NET)              += ipv6/
 obj-$(CONFIG_PACKET)           += packet/
 obj-$(CONFIG_NET_KEY)          += key/
 obj-$(CONFIG_BRIDGE)           += bridge/
 obj-$(CONFIG_NET_DSA)          += dsa/
 obj-$(CONFIG_IPX)              += ipx/
 obj-$(CONFIG_ATALK)            += appletalk/
-obj-$(CONFIG_WAN_ROUTER)       += wanrouter/
 obj-$(CONFIG_X25)              += x25/
 obj-$(CONFIG_LAPB)             += lapb/
 obj-$(CONFIG_NETROM)           += netrom/
@@ -70,3 +69,4 @@ obj-$(CONFIG_CEPH_LIB)                += ceph/
 obj-$(CONFIG_BATMAN_ADV)       += batman-adv/
 obj-$(CONFIG_NFC)              += nfc/
 obj-$(CONFIG_OPENVSWITCH)      += openvswitch/
+obj-$(CONFIG_VSOCKETS) += vmw_vsock/