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/ne.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/ne.c')
| -rw-r--r-- | drivers/net/ne.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 9bbf753c5..36a841c08 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c @@ -177,7 +177,7 @@ struct netdev_entry netcard_drv = * the card. */ -__initfunc(int ne_probe(struct device *dev)) +int __init ne_probe(struct device *dev) { int base_addr = dev ? dev->base_addr : 0; @@ -209,7 +209,7 @@ __initfunc(int ne_probe(struct device *dev)) #endif #ifdef CONFIG_PCI -__initfunc(static int ne_probe_pci(struct device *dev)) +static int __init ne_probe_pci(struct device *dev) { int i; @@ -243,7 +243,7 @@ __initfunc(static int ne_probe_pci(struct device *dev)) } #endif /* CONFIG_PCI */ -__initfunc(static int ne_probe1(struct device *dev, int ioaddr)) +static int __init ne_probe1(struct device *dev, int ioaddr) { int i; unsigned char SA_prom[32]; |