summaryrefslogtreecommitdiffstats
path: root/net/x25/x25_out.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
committerJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
commitf9221fd80343285514568da6c5dbda0f87109de8 (patch)
tree3a2f0077ebea9d094bdeedb319c97cb591d51c51 /net/x25/x25_out.c
parentocfs2_dlmfs: Fix math error when reading LVB. (diff)
parentocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() (diff)
downloadlinux-f9221fd80343285514568da6c5dbda0f87109de8.tar.xz
linux-f9221fd80343285514568da6c5dbda0f87109de8.zip
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/x25/x25_out.c')
-rw-r--r--net/x25/x25_out.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/x25/x25_out.c b/net/x25/x25_out.c
index 2b96b52114d6..52351a26b6fc 100644
--- a/net/x25/x25_out.c
+++ b/net/x25/x25_out.c
@@ -22,6 +22,7 @@
* needed cleaned seq-number fields.
*/
+#include <linux/slab.h>
#include <linux/socket.h>
#include <linux/kernel.h>
#include <linux/string.h>