diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /net/sctp/socket.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 836aa63ee121..13bf5fcdbff1 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -78,6 +78,7 @@ | |||
| 78 | #include <net/inet_common.h> | 78 | #include <net/inet_common.h> |
| 79 | 79 | ||
| 80 | #include <linux/socket.h> /* for sa_family_t */ | 80 | #include <linux/socket.h> /* for sa_family_t */ |
| 81 | #include <linux/export.h> | ||
| 81 | #include <net/sock.h> | 82 | #include <net/sock.h> |
| 82 | #include <net/sctp/sctp.h> | 83 | #include <net/sctp/sctp.h> |
| 83 | #include <net/sctp/sm.h> | 84 | #include <net/sctp/sm.h> |