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 d96b0aa..9ca9572 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -6,20 +6,19 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-obj-$(CONFIG_NET)              := devres.o socket.o core/
+obj-y                          := devres.o socket.o core/
 
-tmp-$(CONFIG_COMPAT)           := compat.o
-obj-$(CONFIG_NET)              += $(tmp-y)
+obj-$(CONFIG_COMPAT)           += compat.o
 
 # LLC has to be linked before the files in net/802/
 obj-$(CONFIG_LLC)              += llc/
-obj-$(CONFIG_NET)              += ethernet/ 802/ sched/ netlink/ bpf/ ethtool/
+obj-y                          += ethernet/ 802/ sched/ netlink/ bpf/ ethtool/
 obj-$(CONFIG_NETFILTER)                += netfilter/
 obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_TLS)              += tls/
 obj-$(CONFIG_XFRM)             += xfrm/
 obj-$(CONFIG_UNIX_SCM)         += unix/
-obj-$(CONFIG_NET)              += ipv6/
+obj-y                          += ipv6/
 obj-$(CONFIG_BPFILTER)         += bpfilter/
 obj-$(CONFIG_PACKET)           += packet/
 obj-$(CONFIG_NET_KEY)          += key/
@@ -56,16 +55,12 @@ 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/
 
-ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o
-endif
 obj-$(CONFIG_DNS_RESOLVER)     += dns_resolver/
 obj-$(CONFIG_CEPH_LIB)         += ceph/
 obj-$(CONFIG_BATMAN_ADV)       += batman-adv/
@@ -77,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/