From d32f834cd6873d9a5ed18ad028700f60d1688cf3 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 26 Jan 2021 08:16:58 +0900 Subject: net: l3mdev: use obj-$(CONFIG_NET_L3_MASTER_DEV) form in net/Makefile CONFIG_NET_L3_MASTER_DEV is a bool option. Change the ifeq conditional to the standard obj-$(CONFIG_NET_L3_MASTER_DEV) form. Use obj-y in net/l3mdev/Makefile because Kbuild visits this Makefile only when CONFIG_NET_L3_MASTER_DEV=y. Signed-off-by: Masahiro Yamada Reviewed-by: David Ahern Link: https://lore.kernel.org/r/20210125231659.106201-4-masahiroy@kernel.org Signed-off-by: Jakub Kicinski --- net/Makefile | 4 +--- net/l3mdev/Makefile | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/Makefile b/net/Makefile index a18547c97cbb..9ca9572188fe 100644 --- a/net/Makefile +++ b/net/Makefile @@ -73,9 +73,7 @@ obj-$(CONFIG_MPLS) += mpls/ obj-$(CONFIG_NET_NSH) += nsh/ obj-$(CONFIG_HSR) += hsr/ obj-$(CONFIG_NET_SWITCHDEV) += switchdev/ -ifneq ($(CONFIG_NET_L3_MASTER_DEV),) -obj-y += l3mdev/ -endif +obj-$(CONFIG_NET_L3_MASTER_DEV) += l3mdev/ obj-$(CONFIG_QRTR) += qrtr/ obj-$(CONFIG_NET_NCSI) += ncsi/ obj-$(CONFIG_XDP_SOCKETS) += xdp/ diff --git a/net/l3mdev/Makefile b/net/l3mdev/Makefile index 59755a9e2f9b..9e7da0acc58c 100644 --- a/net/l3mdev/Makefile +++ b/net/l3mdev/Makefile @@ -3,4 +3,4 @@ # Makefile for the L3 device API # -obj-$(CONFIG_NET_L3_MASTER_DEV) += l3mdev.o +obj-y += l3mdev.o -- cgit v1.2.1