summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2021-01-26 08:16:56 +0900
committerJakub Kicinski <kuba@kernel.org>2021-01-27 17:03:52 -0800
commit1e328ed559201c4a3733b148b0afe3cfb4ad8b45 (patch)
tree1c15bd1bbaf6c081600409758727c9f218bc7a3e /net
parent8b5f4eb3ab700046b9f41d53544791fa02852551 (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/Makefile4
-rw-r--r--net/dcb/Makefile2
2 files changed, 2 insertions, 4 deletions
diff --git a/net/Makefile b/net/Makefile
index 6fa3b2e26cab..a7e38bd463a4 100644
--- 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 3016e5a7716a..2c0fa16ee2a9 100644
--- 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