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
/
ewrk3.c
diff --git
a/drivers/net/ewrk3.c
b/drivers/net/ewrk3.c
index
eb9f346
..
d896baa
100644
(file)
--- a/
drivers/net/ewrk3.c
+++ b/
drivers/net/ewrk3.c
@@
-341,6
+341,7
@@
static int num_ewrks3s;
mdelay(1);\
}
mdelay(1);\
}
+#ifndef MODULE
struct net_device * __init ewrk3_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct ewrk3_private));
struct net_device * __init ewrk3_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct ewrk3_private));
@@
-364,6
+365,7
@@
out:
return ERR_PTR(err);
}
return ERR_PTR(err);
}
+#endif
static int __init ewrk3_probe1(struct net_device *dev, u_long iobase, int irq)
{
static int __init ewrk3_probe1(struct net_device *dev, u_long iobase, int irq)
{
@@
-1269,7
+1271,7
@@
static int __init isa_probe(struct net_device *dev, u_long ioaddr)
for (; (i < maxSlots) && (dev != NULL);
iobase += EWRK3_IOP_INC, i++)
{
for (; (i < maxSlots) && (dev != NULL);
iobase += EWRK3_IOP_INC, i++)
{
- if (request_region(iobase, EWRK3_TOTAL_SIZE,
dev->name
)) {
+ if (request_region(iobase, EWRK3_TOTAL_SIZE,
DRV_NAME
)) {
if (DevicePresent(iobase) == 0) {
int irq = dev->irq;
ret = ewrk3_hw_init(dev, iobase);
if (DevicePresent(iobase) == 0) {
int irq = dev->irq;
ret = ewrk3_hw_init(dev, iobase);
@@
-1310,7
+1312,7
@@
static int __init eisa_probe(struct net_device *dev, u_long ioaddr)
for (i = 1; (i < maxSlots) && (dev != NULL); i++, iobase += EISA_SLOT_INC) {
if (EISA_signature(name, EISA_ID) == 0) {
for (i = 1; (i < maxSlots) && (dev != NULL); i++, iobase += EISA_SLOT_INC) {
if (EISA_signature(name, EISA_ID) == 0) {
- if (request_region(iobase, EWRK3_TOTAL_SIZE,
dev->name
) &&
+ if (request_region(iobase, EWRK3_TOTAL_SIZE,
DRV_NAME
) &&
DevicePresent(iobase) == 0) {
int irq = dev->irq;
ret = ewrk3_hw_init(dev, iobase);
DevicePresent(iobase) == 0) {
int irq = dev->irq;
ret = ewrk3_hw_init(dev, iobase);