diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 22:12:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 22:12:37 -0700 |
commit | 7cd4767e696123cdb7447fbd7c281eb8c610c8e4 (patch) | |
tree | 8a44dfbe0a131f6036eab36f887a058e9750fe69 /net/core/Makefile | |
parent | 1957e7fdefce4494cb8d8f09ee2317b7ede24994 (diff) | |
parent | 6e5714eaf77d79ae1c8b47e3e040ff5411b717ec (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net: Compute protocol sequence numbers and fragment IDs using MD5.
crypto: Move md5_transform to lib/md5.c
Diffstat (limited to 'net/core/Makefile')
-rw-r--r-- | net/core/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/Makefile b/net/core/Makefile index 8a04dd22cf77..0d357b1c4e57 100644 --- a/net/core/Makefile +++ b/net/core/Makefile @@ -3,7 +3,7 @@ # obj-y := sock.o request_sock.o skbuff.o iovec.o datagram.o stream.o scm.o \ - gen_stats.o gen_estimator.o net_namespace.o + gen_stats.o gen_estimator.o net_namespace.o secure_seq.o obj-$(CONFIG_SYSCTL) += sysctl_net_core.o |