X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=net%2Fax25%2Fax25_dev.c;h=a7a0e0c9698b0c59de7b553fdda73e947864a027;hb=eb6d42ea17329745d7d712d3aa3bb84ec1da9c85;hp=b787678220fff4d6df193d720208fa67ed981b0f;hpb=9b4f2e9576658c4e52d95dc8d309f51b2e2db096;p=linux-2.6

diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index b787678220..a7a0e0c969 100644
--- a/net/ax25/ax25_dev.c
+++ b/net/ax25/ax25_dev.c
@@ -11,7 +11,6 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>
@@ -83,7 +82,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);