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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
net
/
3c505.c
diff --git
a/drivers/net/3c505.c
b/drivers/net/3c505.c
index
9c81e7b
..
3aa8409
100644
(file)
--- a/
drivers/net/3c505.c
+++ b/
drivers/net/3c505.c
@@
-1614,6
+1614,7
@@
out:
return err;
}
return err;
}
+#ifndef MODULE
struct net_device * __init elplus_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(elp_device));
struct net_device * __init elplus_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(elp_device));
@@
-1632,7
+1633,7
@@
struct net_device * __init elplus_probe(int unit)
return dev;
}
return dev;
}
-#
ifdef MODULE
+#
else
static struct net_device *dev_3c505[ELP_MAX_CARDS];
static int io[ELP_MAX_CARDS];
static int irq[ELP_MAX_CARDS];
static struct net_device *dev_3c505[ELP_MAX_CARDS];
static int io[ELP_MAX_CARDS];
static int irq[ELP_MAX_CARDS];