diff options
| author |   Masahiro Yamada <masahiroy@kernel.org> | 2020-01-06 16:35:26 +0900 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-08 12:38:54 -0800 |
| commit | ea04b445a266cddd5d5c653690d9676df020302f (patch) | |
| tree | 5a4289a08dab26584f6e934c8a2625941fc47a0b /net | |
| parent | net: stmmac: dwmac-sun8i: Allow all RGMII modes (diff) | |
| download | linux-dev-ea04b445a266cddd5d5c653690d9676df020302f.tar.xz linux-dev-ea04b445a266cddd5d5c653690d9676df020302f.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tipc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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) |