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/tipc/socket.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 4b235fc1c70f..cfb20b80b3a1 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
| @@ -40,9 +40,9 @@ | |||
| 40 | #include <linux/socket.h> | 40 | #include <linux/socket.h> |
| 41 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
| 42 | #include <linux/mm.h> | 42 | #include <linux/mm.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/poll.h> | 43 | #include <linux/poll.h> |
| 45 | #include <linux/fcntl.h> | 44 | #include <linux/fcntl.h> |
| 45 | #include <linux/gfp.h> | ||
| 46 | #include <asm/string.h> | 46 | #include <asm/string.h> |
| 47 | #include <asm/atomic.h> | 47 | #include <asm/atomic.h> |
| 48 | #include <net/sock.h> | 48 | #include <net/sock.h> |