projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[platform/kernel/linux-rpi.git]
/
net
/
mptcp
/
subflow.c
diff --git
a/net/mptcp/subflow.c
b/net/mptcp/subflow.c
index
953906e
..
c21a852
100644
(file)
--- a/
net/mptcp/subflow.c
+++ b/
net/mptcp/subflow.c
@@
-10,7
+10,7
@@
#include <linux/module.h>
#include <linux/netdevice.h>
#include <crypto/algapi.h>
-#include <crypto/sha.h>
+#include <crypto/sha
2
.h>
#include <net/sock.h>
#include <net/inet_common.h>
#include <net/inet_hashtables.h>