Merge tag 'for-5.12/libata-2021-02-17' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 6fa3b2e..9ca9572 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/
@@ -74,12 +72,8 @@ 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
-ifneq ($(CONFIG_NET_L3_MASTER_DEV),)
-obj-y                          += l3mdev/
-endif
+obj-$(CONFIG_NET_SWITCHDEV)    += switchdev/
+obj-$(CONFIG_NET_L3_MASTER_DEV)        += l3mdev/
 obj-$(CONFIG_QRTR)             += qrtr/
 obj-$(CONFIG_NET_NCSI)         += ncsi/
 obj-$(CONFIG_XDP_SOCKETS)      += xdp/