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
/
eexpress.c
diff --git
a/drivers/net/eexpress.c
b/drivers/net/eexpress.c
index
24663cb
..
335fde8
100644
(file)
--- a/
drivers/net/eexpress.c
+++ b/
drivers/net/eexpress.c
@@
-115,9
+115,9
@@
#include <linux/slab.h>
#include <linux/mca-legacy.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/mca-legacy.h>
#include <linux/spinlock.h>
+#include <linux/bitops.h>
#include <asm/system.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/irq.h>
@@
-230,7
+230,7
@@
static unsigned short start_code[] = {
/* maps irq number to EtherExpress magic value */
static char irqrmap[] = { 0,0,1,2,3,4,0,0,0,1,5,6,0,0,0,0 };
/* maps irq number to EtherExpress magic value */
static char irqrmap[] = { 0,0,1,2,3,4,0,0,0,1,5,6,0,0,0,0 };
-#ifdef CONFIG_MCA
+#ifdef CONFIG_MCA
_LEGACY
/* mapping of the first four bits of the second POS register */
static unsigned short mca_iomap[] = {
0x270, 0x260, 0x250, 0x240, 0x230, 0x220, 0x210, 0x200,
/* mapping of the first four bits of the second POS register */
static unsigned short mca_iomap[] = {
0x270, 0x260, 0x250, 0x240, 0x230, 0x220, 0x210, 0x200,
@@
-345,7
+345,7
@@
static int __init do_express_probe(struct net_device *dev)
dev->if_port = 0xff; /* not set */
dev->if_port = 0xff; /* not set */
-#ifdef CONFIG_MCA
+#ifdef CONFIG_MCA
_LEGACY
if (MCA_bus) {
int slot = 0;
if (MCA_bus) {
int slot = 0;
@@
-423,6
+423,7
@@
static int __init do_express_probe(struct net_device *dev)
return -ENODEV;
}
return -ENODEV;
}
+#ifndef MODULE
struct net_device * __init express_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
struct net_device * __init express_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
@@
-443,6
+444,7
@@
struct net_device * __init express_probe(int unit)
free_netdev(dev);
return ERR_PTR(err);
}
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
/*
* open and initialize the adapter, ready for use
/*
* open and initialize the adapter, ready for use
@@
-1689,8
+1691,8
@@
static struct net_device *dev_eexp[EEXP_MAX_CARDS];
static int irq[EEXP_MAX_CARDS];
static int io[EEXP_MAX_CARDS];
static int irq[EEXP_MAX_CARDS];
static int io[EEXP_MAX_CARDS];
-
MODULE_PARM(io, "1-" __MODULE_STRING(EEXP_MAX_CARDS) "i"
);
-
MODULE_PARM(irq, "1-" __MODULE_STRING(EEXP_MAX_CARDS) "i"
);
+
module_param_array(io, int, NULL, 0
);
+
module_param_array(irq, int, NULL, 0
);
MODULE_PARM_DESC(io, "EtherExpress 16 I/O base address(es)");
MODULE_PARM_DESC(irq, "EtherExpress 16 IRQ number(s)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(io, "EtherExpress 16 I/O base address(es)");
MODULE_PARM_DESC(irq, "EtherExpress 16 IRQ number(s)");
MODULE_LICENSE("GPL");