Merge branch 'linus' into perf/urgent, to synchronize with upstream

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

diff --git a/net/Makefile b/net/Makefile
index 449fc0b..07ea481 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_NET)             += $(tmp-y)
 
 # LLC has to be linked before the files in net/802/
 obj-$(CONFIG_LLC)              += llc/
-obj-$(CONFIG_NET)              += ethernet/ 802/ sched/ netlink/ bpf/
+obj-$(CONFIG_NET)              += ethernet/ 802/ sched/ netlink/ bpf/ ethtool/
 obj-$(CONFIG_NETFILTER)                += netfilter/
 obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_TLS)              += tls/
@@ -87,3 +87,4 @@ endif
 obj-$(CONFIG_QRTR)             += qrtr/
 obj-$(CONFIG_NET_NCSI)         += ncsi/
 obj-$(CONFIG_XDP_SOCKETS)      += xdp/
+obj-$(CONFIG_MPTCP)            += mptcp/