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/cops.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/cops.c')
| -rw-r--r-- | drivers/net/cops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cops.c b/drivers/net/cops.c index e920debeb..0d3469204 100644 --- a/drivers/net/cops.c +++ b/drivers/net/cops.c @@ -218,7 +218,7 @@ static struct enet_statistics *cops_get_stats (struct device *dev); * If dev->base_addr in [1..0x1ff], always return failure. * otherwise go with what we pass in. */ -__initfunc(int cops_probe(struct device *dev)) +int __init cops_probe(struct device *dev) { int i; int base_addr = dev ? dev->base_addr : 0; @@ -252,7 +252,7 @@ __initfunc(int cops_probe(struct device *dev)) * probes on the ISA bus. A good device probes avoids doing writes, and * verifies that the correct device exists and functions. */ -__initfunc(static int cops_probe1(struct device *dev, int ioaddr)) +static int __init cops_probe1(struct device *dev, int ioaddr) { struct cops_local *lp; static unsigned version_printed = 0; @@ -348,7 +348,7 @@ __initfunc(static int cops_probe1(struct device *dev, int ioaddr)) return 0; } -__initfunc(static int cops_irq (int ioaddr, int board)) +static int __init cops_irq (int ioaddr, int board) { /* * This does not use the IRQ to determine where the IRQ is. We just * assume that when we get a correct status response that it's the IRQ. |