summaryrefslogtreecommitdiff
path: root/net/x25/Makefile
blob: a2c34ab6f194f44ce5ca2bf51c077579adda1caa (plain)
1
2
3
4
5
6
7
8
9
10
#
# Makefile for the Linux X.25 Packet layer.
#

obj-$(CONFIG_X25) += x25.o

x25-y			:= af_x25.o x25_dev.o x25_facilities.o x25_in.o \
			   x25_link.o x25_out.o x25_route.o x25_subr.o \
			   x25_timer.o x25_proc.o x25_forward.o
x25-$(CONFIG_SYSCTL)	+= sysctl_net_x25.o
d>
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/batman-adv/send.h
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/send.h')