Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[karo-tx-linux.git] / net / x25 / af_x25.c

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 8ed51c926c5036989f107a2c6d0789b62f6f1499..cbddd0cb83f1a2445ba26f60225b0fa15a6a21b2 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -47,6 +47,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
 #include <asm/uaccess.h>