projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[linux-2.6-microblaze.git]
/
fs
/
dlm
/
lowcomms.c
diff --git
a/fs/dlm/lowcomms.c
b/fs/dlm/lowcomms.c
index
4f5ad24
..
d0ccd2f
100644
(file)
--- a/
fs/dlm/lowcomms.c
+++ b/
fs/dlm/lowcomms.c
@@
-52,8
+52,8
@@
#include <linux/mutex.h>
#include <linux/sctp.h>
#include <linux/slab.h>
+#include <linux/sctp.h>
#include <net/sctp/sctp.h>
-#include <net/sctp/user.h>
#include <net/ipv6.h>
#include "dlm_internal.h"