diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/net/3c515.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/net/3c515.c')
| -rw-r--r-- | drivers/net/3c515.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index b74ca51e6..7dc831e58 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c @@ -39,16 +39,8 @@ static int max_interrupt_work = 20; #define RX_RING_SIZE 16 #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ -#ifdef MODULE -#ifdef MODVERSIONS -#include <linux/modversions.h> -#endif #include <linux/module.h> #include <linux/version.h> -#else -#define MOD_INC_USE_COUNT -#define MOD_DEC_USE_COUNT -#endif #include <linux/kernel.h> #include <linux/sched.h> @@ -67,12 +59,9 @@ static int max_interrupt_work = 20; #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/skbuff.h> -#if (LINUX_VERSION_CODE >= 0x10344) + #define NEW_MULTICAST #include <linux/delay.h> -#else -#define udelay(microsec) do { int _i = 4*microsec; while (--_i > 0) { __SLOW_DOWN_IO; }} while (0) -#endif /* Kernel version compatibility functions. */ #define RUN_AT(x) (jiffies + (x)) @@ -758,7 +747,7 @@ vortex_open(struct device *dev) vp->tx_skbuff[i] = 0; outl(0, ioaddr + DownListPtr); } - /* Set reciever mode: presumably accept b-case and phys addr only. */ + /* Set receiver mode: presumably accept b-case and phys addr only. */ set_rx_mode(dev); outw(StatsEnable, ioaddr + EL3_CMD); /* Turn on statistics. */ |