summaryrefslogtreecommitdiff
path: root/net/x25/x25_forward.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-05-08 21:59:58 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2010-05-08 21:59:58 (GMT)
commitd7be0ce6afb1df60bc786f57410407ceae92b994 (patch)
tree5e91acfc12c833531ad3320f274e0cd96a129973 /net/x25/x25_forward.c
parente08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff)
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff)
downloadlinux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'net/x25/x25_forward.c')
-rw-r--r--net/x25/x25_forward.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/x25/x25_forward.c b/net/x25/x25_forward.c
index 056a55f..25a8107 100644
--- a/net/x25/x25_forward.c
+++ b/net/x25/x25_forward.c
@@ -10,6 +10,7 @@
*/
#include <linux/if_arp.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <net/x25.h>
LIST_HEAD(x25_forward_list);