linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index eebf5f0..e6df375 100644 (file)
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -75,7 +75,6 @@ static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon <wimpie@kotnet.o
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
-#include <linux/jiffies.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -396,7 +395,7 @@ static int __init ne2_probe1(struct net_device *dev, int slot)
                outb(inb(base_addr + NE_RESET), base_addr + NE_RESET);
 
                while ((inb_p(base_addr + EN0_ISR) & ENISR_RESET) == 0)
-                       if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
+                       if (jiffies - reset_start_time > 2*HZ/100) {
                                printk(" not found (no reset ack).\n");
                                retval = -ENODEV;
                                goto out;
@@ -549,7 +548,7 @@ static void ne_reset_8390(struct net_device *dev)
 
        /* This check _should_not_ be necessary, omit eventually. */
        while ((inb_p(NE_BASE+EN0_ISR) & ENISR_RESET) == 0)
-               if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
+               if (jiffies - reset_start_time > 2*HZ/100) {
                        printk("%s: ne_reset_8390() did not complete.\n", 
                                        dev->name);
                        break;
@@ -750,7 +749,7 @@ retry:
 #endif
 
        while ((inb_p(nic_base + EN0_ISR) & ENISR_RDC) == 0)
-               if (time_after(jiffies, dma_start + 2*HZ/100)) {                /* 20ms */
+               if (jiffies - dma_start > 2*HZ/100) {           /* 20ms */
                        printk("%s: timeout waiting for Tx RDC.\n", dev->name);
                        ne_reset_8390(dev);
                        NS8390_init(dev,1);
@@ -780,7 +779,7 @@ MODULE_PARM_DESC(bad, "(ignored)");
 
 /* Module code fixed by David Weinehall */
 
-int __init init_module(void)
+int init_module(void)
 {
        struct net_device *dev;
        int this_dev, found = 0;