diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2021-01-26 08:16:57 +0900 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-27 17:03:52 -0800 |
| commit | 0cfd99b487f1f1b0661a966c2182115d2989e5c3 (patch) | |
| tree | f18630d159df850059dc8996f063a04630a16446 | |
| parent | 1e328ed559201c4a3733b148b0afe3cfb4ad8b45 (diff) | |
| download | linux-stable-0cfd99b487f1f1b0661a966c2182115d2989e5c3.tar.gz linux-stable-0cfd99b487f1f1b0661a966c2182115d2989e5c3.tar.bz2 linux-stable-0cfd99b487f1f1b0661a966c2182115d2989e5c3.zip | |
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>
| -rw-r--r-- | net/Makefile | 4 | ||||
| -rw-r--r-- | net/switchdev/Makefile | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/Makefile b/net/Makefile index a7e38bd463a4..a18547c97cbb 100644 --- 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 bd69a3136e76..c5561d7f3a7c 100644 --- 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 |