[PATCH 1/2] tipc: do not add socket.o to tipc-y twice

From: Masahiro Yamada
Date: Mon Jan 06 2020 - 02:36:34 EST


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@xxxxxxxxxx>
---

net/tipc/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/tipc/Makefile b/net/tipc/Makefile
index 11255e970dd4..1603f5b49e73 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)

--
2.17.1