diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /net/sctp/ulpevent.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'net/sctp/ulpevent.c')
| -rw-r--r-- | net/sctp/ulpevent.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c index 8b3560fd876d..aa72e89c3ee1 100644 --- a/net/sctp/ulpevent.c +++ b/net/sctp/ulpevent.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | * be incorporated into the next SCTP release. | 43 | * be incorporated into the next SCTP release. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/slab.h> | ||
| 46 | #include <linux/types.h> | 47 | #include <linux/types.h> |
| 47 | #include <linux/skbuff.h> | 48 | #include <linux/skbuff.h> |
| 48 | #include <net/sctp/structs.h> | 49 | #include <net/sctp/structs.h> |