aboutsummaryrefslogtreecommitdiffstats
path: root/net/x25/x25_in.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-11 02:44:30 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-11 02:44:30 -0700
commit4a1032faac94ebbf647460ae3e06fc21146eb280 (patch)
tree7f31b97beb0406faa1523e619289ad0ab07c9787 /net/x25/x25_in.c
parentRevert "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb" (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff)
downloadlinux-dev-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.xz
linux-dev-4a1032faac94ebbf647460ae3e06fc21146eb280.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/x25/x25_in.c')
-rw-r--r--net/x25/x25_in.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index b39072f3a297..372ac226e648 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -23,6 +23,7 @@
* i-frames.
*/
+#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/string.h>