linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / atari_bionet.c

diff --git a/drivers/net/atari_bionet.c b/drivers/net/atari_bionet.c
index 92a2ec2..0095384 100644 (file)
--- a/drivers/net/atari_bionet.c
+++ b/drivers/net/atari_bionet.c
@@ -97,6 +97,7 @@ static char version[] =
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -105,7 +106,6 @@ static char version[] =
 #include <asm/setup.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/atarihw.h>
@@ -155,7 +155,7 @@ static int bionet_close(struct net_device *dev);
 static struct net_device_stats *net_get_stats(struct net_device *dev);
 static void bionet_tick(unsigned long);
 
-static struct timer_list bionet_timer = TIMER_INITIALIZER(bionet_tick, 0, 0);
+static DEFINE_TIMER(bionet_timer, bionet_tick, 0, 0);
 
 #define STRAM_ADDR(a)  (((a) & 0xff000000) == 0)