Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[sfrench/cifs-2.6.git] / net / x25 / x25_forward.c

diff --git a/net/x25/x25_forward.c b/net/x25/x25_forward.c
index 34478035e05edd64131525b438eab2bedc55791c..25a81079396863af36ac7e2eedb27c1d43c00b1d 100644 (file)
--- a/net/x25/x25_forward.c
+++ b/net/x25/x25_forward.c
@@ -10,9 +10,10 @@
  */
 #include <linux/if_arp.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <net/x25.h>
 
-struct list_head x25_forward_list = LIST_HEAD_INIT(x25_forward_list);
+LIST_HEAD(x25_forward_list);
 DEFINE_RWLOCK(x25_forward_list_lock);
 
 int x25_forward_call(struct x25_address *dest_addr, struct x25_neigh *from,