net: switchdev: use obj-$(CONFIG_NET_SWITCHDEV) form in net/Makefile

CONFIG_NET_SWITCHDEV is a bool option. Change the ifeq conditional to
the standard obj-$(CONFIG_NET_SWITCHDEV) form.

Use obj-y in net/switchdev/Makefile because Kbuild visits this Makefile
only when CONFIG_NET_SWITCHDEV=y.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20210125231659.106201-3-masahiroy@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/Makefile b/net/Makefile
index a7e38bd463a44f67d93c72ab07342e70bb1b54c3..a18547c97cbb8078f27e802652ad4acb723dd2e6 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -72,9 +72,7 @@ obj-$(CONFIG_VSOCKETS)        += vmw_vsock/
 obj-$(CONFIG_MPLS)             += mpls/
 obj-$(CONFIG_NET_NSH)          += nsh/
 obj-$(CONFIG_HSR)              += hsr/
-ifneq ($(CONFIG_NET_SWITCHDEV),)
-obj-y                          += switchdev/
-endif
+obj-$(CONFIG_NET_SWITCHDEV)    += switchdev/
 ifneq ($(CONFIG_NET_L3_MASTER_DEV),)
 obj-y                          += l3mdev/
 endif

diff --git a/net/switchdev/Makefile b/net/switchdev/Makefile
index bd69a3136e76a3584b17c9099fd3128a2c852602..c5561d7f3a7c568f6001e53e49aeafa5ab0b1161 100644 (file)
--- a/net/switchdev/Makefile
+++ b/net/switchdev/Makefile
@@ -3,4 +3,4 @@
 # Makefile for the Switch device API
 #
 
-obj-$(CONFIG_NET_SWITCHDEV) += switchdev.o
+obj-y += switchdev.o