diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/net/eth16i.c | |
parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/eth16i.c')
-rw-r--r-- | drivers/net/eth16i.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 391f6194a..8958374d4 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c @@ -450,7 +450,7 @@ static char *cardname = "ICL EtherTeam 16i/32"; #else /* Not HAVE_DEVLIST */ -__initfunc(int eth16i_probe(struct device *dev)) +int __init eth16i_probe(struct device *dev) { int i; int ioaddr; @@ -484,7 +484,7 @@ __initfunc(int eth16i_probe(struct device *dev)) } #endif /* Not HAVE_DEVLIST */ -__initfunc(static int eth16i_probe1(struct device *dev, int ioaddr)) +static int __init eth16i_probe1(struct device *dev, int ioaddr) { static unsigned version_printed = 0; boot = 1; /* To inform initilization that we are in boot probe */ @@ -886,7 +886,7 @@ static int eth16i_check_signature(int ioaddr) creg[0] &= 0x0F; /* Mask collision cnr */ creg[2] &= 0x7F; /* Mask DCLEN bit */ -#ifdef 0 +#if 0 /* This was removed because the card was sometimes left to state from which it couldn't be find anymore. If there is need |