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

[linux-2.6-block.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 1f6c3e4b36d5225f2f3d88ed4cbd1299702eb79f..38704bdf941ad6697db492959a909ca716ea9d4c 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -71,3 +71,6 @@ obj-$(CONFIG_OPENVSWITCH)     += openvswitch/
 obj-$(CONFIG_VSOCKETS) += vmw_vsock/
 obj-$(CONFIG_NET_MPLS_GSO)     += mpls/
 obj-$(CONFIG_HSR)              += hsr/
+ifneq ($(CONFIG_NET_SWITCHDEV),)
+obj-y                          += switchdev/
+endif