diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:11:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:11:38 -0800 |
| commit | 1a0153507ffae9cf3350e76c12d441788c0191e1 (patch) | |
| tree | d05a502b4fc05202c84c1667019460c08ea088cd /drivers/net/cs89x0.c | |
| parent | b0683ac8928c4cf40646a6ce3eb6ffe94605acfa (diff) | |
v2.4.3.2 -> v2.4.3.3
- Hui-Fen Hsu: sis900 driver update
- NIIBE Yutaka: Super-H update
- Alan Cox: more resyncs (ARM down, but more to go)
- David Miller: network zerocopy, Sparc sync, qlogic,FC fix, etc.
- David Miller/me: get rid of various drivers hacks to do mmap
alignment behind the back of the VM layer. Create a real
protocol for it.
Diffstat (limited to 'drivers/net/cs89x0.c')
| -rw-r--r-- | drivers/net/cs89x0.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 63e190a36ade..9b6cd119240b 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c @@ -130,7 +130,6 @@ #include <asm/dma.h> #endif #include <linux/errno.h> -#include <linux/init.h> #include <linux/spinlock.h> #include <linux/netdevice.h> @@ -361,7 +360,7 @@ static int __init cs89x0_probe1(struct net_device *dev, int ioaddr) { struct net_local *lp; - static unsigned version_printed = 0; + static unsigned version_printed; int i; unsigned rev_type = 0; int eeprom_buff[CHKSUM_LEN]; @@ -1590,14 +1589,14 @@ static struct net_device dev_cs89x0 = { * avoid breaking someone's startup scripts */ -static int io=0; -static int irq=0; -static int debug=0; +static int io; +static int irq; +static int debug; static char media[8]; static int duplex=-1; -static int use_dma = 0; /* These generate unused var warnings if ALLOW_DMA = 0 */ -static int dma=0; +static int use_dma; /* These generate unused var warnings if ALLOW_DMA = 0 */ +static int dma; static int dmasize=16; /* or 64 */ MODULE_PARM(io, "i"); |