Merge branch 'dp83640-fixes'

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

diff --git a/net/Makefile b/net/Makefile
index 38704bdf941ad6697db492959a909ca716ea9d4c..a5d04098dfce8693c46785f6c0dfa90bd23f4187 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -69,8 +69,11 @@ obj-$(CONFIG_BATMAN_ADV)     += batman-adv/
 obj-$(CONFIG_NFC)              += nfc/
 obj-$(CONFIG_OPENVSWITCH)      += openvswitch/
 obj-$(CONFIG_VSOCKETS) += vmw_vsock/
-obj-$(CONFIG_NET_MPLS_GSO)     += mpls/
+obj-$(CONFIG_MPLS)             += mpls/
 obj-$(CONFIG_HSR)              += hsr/
 ifneq ($(CONFIG_NET_SWITCHDEV),)
 obj-y                          += switchdev/
 endif
+ifneq ($(CONFIG_NET_L3_MASTER_DEV),)
+obj-y                          += l3mdev/
+endif