Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 4f4ee083064c8c487750527df0755c7ad33ac436..091e7b04f301539036dca468d045d0615a33f4b4 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -26,7 +26,6 @@ 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/