diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 16:37:29 -0400 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 16:37:29 -0400 |
| commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
| tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /net/socket.c | |
| parent | a36d515c7a2dfacebcf41729f6812dbc424ebcf0 (diff) | |
| parent | a9743fcdc0eb43d028b71267438076e1b0112ba0 (diff) | |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index f55ffe9f8c87..5e8d0af3c0e7 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -87,6 +87,7 @@ | |||
| 87 | #include <linux/wireless.h> | 87 | #include <linux/wireless.h> |
| 88 | #include <linux/nsproxy.h> | 88 | #include <linux/nsproxy.h> |
| 89 | #include <linux/magic.h> | 89 | #include <linux/magic.h> |
| 90 | #include <linux/slab.h> | ||
| 90 | 91 | ||
| 91 | #include <asm/uaccess.h> | 92 | #include <asm/uaccess.h> |
| 92 | #include <asm/unistd.h> | 93 | #include <asm/unistd.h> |