diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /net/sctp/input.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'net/sctp/input.c')
| -rw-r--r-- | net/sctp/input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index 3d74b264ea22..2a570184e5a9 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #include <linux/socket.h> | 53 | #include <linux/socket.h> |
| 54 | #include <linux/ip.h> | 54 | #include <linux/ip.h> |
| 55 | #include <linux/time.h> /* For struct timeval */ | 55 | #include <linux/time.h> /* For struct timeval */ |
| 56 | #include <linux/slab.h> | ||
| 56 | #include <net/ip.h> | 57 | #include <net/ip.h> |
| 57 | #include <net/icmp.h> | 58 | #include <net/icmp.h> |
| 58 | #include <net/snmp.h> | 59 | #include <net/snmp.h> |