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
/
3c523.c
diff --git
a/drivers/net/3c523.c
b/drivers/net/3c523.c
index
d479223
..
1902f79
100644
(file)
--- a/
drivers/net/3c523.c
+++ b/
drivers/net/3c523.c
@@
-445,7
+445,7
@@
static int __init do_elmc_probe(struct net_device *dev)
slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
continue;
}
slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
continue;
}
- if (!request_region(dev->base_addr, ELMC_IO_EXTENT,
dev->name
)) {
+ if (!request_region(dev->base_addr, ELMC_IO_EXTENT,
DRV_NAME
)) {
slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
continue;
}
slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
continue;
}
@@
-585,6
+585,7
@@
static void cleanup_card(struct net_device *dev)
release_region(dev->base_addr, ELMC_IO_EXTENT);
}
release_region(dev->base_addr, ELMC_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init elmc_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct priv));
struct net_device * __init elmc_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct priv));
@@
-609,6
+610,7
@@
out:
free_netdev(dev);
return ERR_PTR(err);
}
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
/**********************************************
* init the chip (elmc-interrupt should be disabled?!)
/**********************************************
* init the chip (elmc-interrupt should be disabled?!)