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/hp-plus.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/hp-plus.c')
| -rw-r--r-- | drivers/net/hp-plus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index bcb76242a..b58ba73fc 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c @@ -123,7 +123,7 @@ struct netdev_entry hpplus_drv = {"hpplus", hpp_probe1, HP_IO_EXTENT, hpplus_portlist}; #else -__initfunc(int hp_plus_probe(struct device *dev)) +int __init hp_plus_probe(struct device *dev) { int i; int base_addr = dev ? dev->base_addr : 0; @@ -146,7 +146,7 @@ __initfunc(int hp_plus_probe(struct device *dev)) #endif /* Do the interesting part of the probe at a single address. */ -__initfunc(int hpp_probe1(struct device *dev, int ioaddr)) +int __init hpp_probe1(struct device *dev, int ioaddr) { int i; unsigned char checksum = 0; |