X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fax25%2Fax25_dev.c;h=c1cb982f6e86954018c7311d17016cb2189f9bf1;hb=347815fcc63ac4c4a975bf3ca2c889c2f843ae0d;hp=528c874d9828df06f6d2c880b808d31da4164041;hpb=a22a0fab32e1216df56e4b9a577dc5c922cf7524;p=~andy%2Flinux

diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index 528c874d982..c1cb982f6e8 100644
--- a/net/ax25/ax25_dev.c
+++ b/net/ax25/ax25_dev.c
@@ -9,6 +9,7 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
+#include <linux/slab.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
@@ -82,7 +83,7 @@ void ax25_dev_device_up(struct net_device *dev)
 	ax25_dev->values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT;
 
 #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
-	init_timer(&ax25_dev->dama.slave_timer);
+	ax25_ds_setup_timer(ax25_dev);
 #endif
 
 	spin_lock_bh(&ax25_dev_lock);