diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 02:00:25 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 02:00:25 -0400 |
| commit | 31881d74b6dd1a6c530cff61248def4f2da38bee (patch) | |
| tree | be62420cf39192074e13b25553d172b9d5e58a33 /include/net/sctp/constants.h | |
| parent | 8855f30cd2b68012571932c7b01290c20be4508c (diff) | |
| parent | 257867dc8d893690c175c1f717f91c3b6d44a63d (diff) | |
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Pull in changes from Henrik: "a trivial MT documentation fix".
Diffstat (limited to 'include/net/sctp/constants.h')
| -rw-r--r-- | include/net/sctp/constants.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h index a7dd5c50df79..ca50e0751e47 100644 --- a/include/net/sctp/constants.h +++ b/include/net/sctp/constants.h | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | 49 | ||
| 50 | #include <linux/sctp.h> | 50 | #include <linux/sctp.h> |
| 51 | #include <linux/ipv6.h> /* For ipv6hdr. */ | 51 | #include <linux/ipv6.h> /* For ipv6hdr. */ |
| 52 | #include <net/sctp/user.h> | ||
| 53 | #include <net/tcp_states.h> /* For TCP states used in sctp_sock_state_t */ | 52 | #include <net/tcp_states.h> /* For TCP states used in sctp_sock_state_t */ |
| 54 | 53 | ||
| 55 | /* Value used for stream negotiation. */ | 54 | /* Value used for stream negotiation. */ |