From: Masahiro Yamada <masahiroy@kernel.org>
Date: Mon, 6 Jan 2020 07:35:26 +0000 (+0900)
Subject: tipc: do not add socket.o to tipc-y twice
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=ea04b445a266cddd5d5c653690d9676df020302f;p=kernel.git

tipc: do not add socket.o to tipc-y twice

net/tipc/Makefile adds socket.o twice.

tipc-y	+= addr.o bcast.o bearer.o \
           core.o link.o discover.o msg.o  \
           name_distr.o  subscr.o monitor.o name_table.o net.o  \
           netlink.o netlink_compat.o node.o socket.o eth_media.o \
                                             ^^^^^^^^
           topsrv.o socket.o group.o trace.o
                    ^^^^^^^^

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/tipc/Makefile b/net/tipc/Makefile
index 11255e970dd45..1603f5b49e731 100644
--- a/net/tipc/Makefile
+++ b/net/tipc/Makefile
@@ -9,7 +9,7 @@ tipc-y	+= addr.o bcast.o bearer.o \
 	   core.o link.o discover.o msg.o  \
 	   name_distr.o  subscr.o monitor.o name_table.o net.o  \
 	   netlink.o netlink_compat.o node.o socket.o eth_media.o \
-	   topsrv.o socket.o group.o trace.o
+	   topsrv.o group.o trace.o
 
 CFLAGS_trace.o += -I$(src)