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/ne3210.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/ne3210.c')
| -rw-r--r-- | drivers/net/ne3210.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c index eb3098095..51d11cb0c 100644 --- a/drivers/net/ne3210.c +++ b/drivers/net/ne3210.c @@ -95,7 +95,7 @@ static unsigned int shmem_map[] __initdata = {0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0 * PROM for a match against the value assigned to Novell. */ -__initfunc(int ne3210_probe(struct device *dev)) +int __init ne3210_probe(struct device *dev) { unsigned short ioaddr = dev->base_addr; @@ -122,7 +122,7 @@ __initfunc(int ne3210_probe(struct device *dev)) return ENODEV; } -__initfunc(int ne3210_probe1(struct device *dev, int ioaddr)) +int __init ne3210_probe1(struct device *dev, int ioaddr) { int i; unsigned long eisa_id; |