diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
| commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
| tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /drivers/net/wd.c | |
| parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) | |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'drivers/net/wd.c')
| -rw-r--r-- | drivers/net/wd.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/net/wd.c b/drivers/net/wd.c index 7af3be77a..56e8bd5ab 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c @@ -20,7 +20,7 @@ Paul Gortmaker : multiple card support for module users, support for non-standard memory sizes. - + */ @@ -33,6 +33,7 @@ static const char *version = #include <linux/sched.h> #include <linux/errno.h> #include <linux/string.h> +#include <linux/init.h> #include <asm/io.h> #include <asm/system.h> @@ -41,7 +42,7 @@ static const char *version = #include "8390.h" /* A zero-terminated list of I/O addresses to be probed. */ -static unsigned int wd_portlist[] = +static unsigned int wd_portlist[] __initdata = {0x300, 0x280, 0x380, 0x240, 0}; int wd_probe(struct device *dev); @@ -85,7 +86,7 @@ struct netdev_entry wd_drv = {"wd", wd_probe1, WD_IO_EXTENT, wd_portlist}; #else -int wd_probe(struct device *dev) +__initfunc(int wd_probe(struct device *dev)) { int i; int base_addr = dev ? dev->base_addr : 0; @@ -107,7 +108,7 @@ int wd_probe(struct device *dev) } #endif -int wd_probe1(struct device *dev, int ioaddr) +__initfunc(int wd_probe1(struct device *dev, int ioaddr)) { int i; int checksum = 0; @@ -259,7 +260,7 @@ int wd_probe1(struct device *dev, int ioaddr) } /* Allocate dev->priv and fill in 8390 specific dev fields. */ - if (ethdev_init(dev)) { + if (ethdev_init(dev)) { printk (" unable to get memory for dev->priv.\n"); free_irq(dev->irq, NULL); return -ENOMEM; @@ -452,6 +453,11 @@ static int irq[MAX_WD_CARDS] = { 0, }; static int mem[MAX_WD_CARDS] = { 0, }; static int mem_end[MAX_WD_CARDS] = { 0, }; /* for non std. mem size */ +MODULE_PARM(io, "1-" __MODULE_STRING(MAX_WD_CARDS) "i"); +MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_WD_CARDS) "i"); +MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_WD_CARDS) "i"); +MODULE_PARM(mem_end, "1-" __MODULE_STRING(MAX_WD_CARDS) "i"); + /* This is set up so that only a single autoprobe takes place per call. ISA device autoprobes on a running machine are not recommended. */ int |