net: dcb: use obj-$(CONFIG_DCB) form in net/Makefile

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

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

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

diff --git a/net/Makefile b/net/Makefile
index 6fa3b2e26cabc2b0ec001729b3c5abcd34ea7d1e..a7e38bd463a44f67d93c72ab07342e70bb1b54c3 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -55,9 +55,7 @@ obj-$(CONFIG_SMC)             += smc/
 obj-$(CONFIG_RFKILL)           += rfkill/
 obj-$(CONFIG_NET_9P)           += 9p/
 obj-$(CONFIG_CAIF)             += caif/
-ifneq ($(CONFIG_DCB),)
-obj-y                          += dcb/
-endif
+obj-$(CONFIG_DCB)              += dcb/
 obj-$(CONFIG_6LOWPAN)          += 6lowpan/
 obj-$(CONFIG_IEEE802154)       += ieee802154/
 obj-$(CONFIG_MAC802154)                += mac802154/

diff --git a/net/dcb/Makefile b/net/dcb/Makefile
index 3016e5a7716a0f5170eccd676a7736598c7e310d..2c0fa16ee2a9258b6f61052211ff79013e1bdea2 100644 (file)
--- a/net/dcb/Makefile
+++ b/net/dcb/Makefile
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_DCB) += dcbnl.o dcbevent.o
+obj-y += dcbnl.o dcbevent.o