git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
smc-mca.c
diff --git
a/drivers/net/smc-mca.c
b/drivers/net/smc-mca.c
index
b67fcc0
..
b7c5a4c
100644
(file)
--- a/
drivers/net/smc-mca.c
+++ b/
drivers/net/smc-mca.c
@@
-51,6
+51,8
@@
#include "8390.h"
#include "smc-mca.h"
#include "8390.h"
#include "smc-mca.h"
+#define DRV_NAME "smc-mca"
+
static int ultramca_open(struct net_device *dev);
static void ultramca_reset_8390(struct net_device *dev);
static void ultramca_get_8390_hdr(struct net_device *dev,
static int ultramca_open(struct net_device *dev);
static void ultramca_reset_8390(struct net_device *dev);
static void ultramca_get_8390_hdr(struct net_device *dev,
@@
-93,8
+95,8
@@
static int ultra_io[MAX_ULTRAMCA_CARDS];
static int ultra_irq[MAX_ULTRAMCA_CARDS];
MODULE_LICENSE("GPL");
static int ultra_irq[MAX_ULTRAMCA_CARDS];
MODULE_LICENSE("GPL");
-
MODULE_PARM(ultra_io, "1-" __MODULE_STRING(MAX_ULTRAMCA_CARDS) "i"
);
-
MODULE_PARM(ultra_irq, "1-" __MODULE_STRING(MAX_ULTRAMCA_CARDS) "i"
);
+
module_param_array(ultra_io, int, NULL, 0
);
+
module_param_array(ultra_irq, int, NULL, 0
);
MODULE_PARM_DESC(ultra_io, "SMC Ultra/EtherEZ MCA I/O base address(es)");
MODULE_PARM_DESC(ultra_irq, "SMC Ultra/EtherEZ MCA IRQ number(s)");
MODULE_PARM_DESC(ultra_io, "SMC Ultra/EtherEZ MCA I/O base address(es)");
MODULE_PARM_DESC(ultra_irq, "SMC Ultra/EtherEZ MCA IRQ number(s)");
@@
-265,7
+267,7
@@
int __init ultramca_probe(struct device *gen_dev)
goto err_unclaim;
}
goto err_unclaim;
}
- if (!request_region(ioaddr, ULTRA_IO_EXTENT,
dev->name
)) {
+ if (!request_region(ioaddr, ULTRA_IO_EXTENT,
DRV_NAME
)) {
rc = -ENODEV;
goto err_unclaim;
}
rc = -ENODEV;
goto err_unclaim;
}