Merge tag 'linux-can-next-for-3.19-20141207' of git://gitorious.org/linux-can/linux...

[cascardo/linux.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 7ed1970..95fc694 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -73,3 +73,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