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/fmv18x.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/fmv18x.c')
| -rw-r--r-- | drivers/net/fmv18x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fmv18x.c b/drivers/net/fmv18x.c index 749e1f123..0c51aa90b 100644 --- a/drivers/net/fmv18x.c +++ b/drivers/net/fmv18x.c @@ -132,8 +132,8 @@ static void set_multicast_list(struct device *dev); struct netdev_entry fmv18x_drv = {"fmv18x", fmv18x_probe1, FMV18X_IO_EXTENT, fmv18x_probe_list}; #else -__initfunc(int -fmv18x_probe(struct device *dev)) +int __init +fmv18x_probe(struct device *dev) { int i; int base_addr = dev ? dev->base_addr : 0; @@ -163,7 +163,7 @@ fmv18x_probe(struct device *dev)) that can be done is checking a few bits and then diving right into MAC address check. */ -__initfunc(int fmv18x_probe1(struct device *dev, short ioaddr)) +int __init fmv18x_probe1(struct device *dev, short ioaddr) { char irqmap[4] = {3, 7, 10, 15}; char irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15}; |