Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 7ed1970074b07bfcf0803f468f62efba7a9018ac..38704bdf941ad6697db492959a909ca716ea9d4c 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-obj-y  := nonet.o
-
 obj-$(CONFIG_NET)              := socket.o core/
 
 tmp-$(CONFIG_COMPAT)           := compat.o
@@ -73,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