X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2F3c523.c;h=1902f792199e407a23f868b182795c66158dcdbb;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=d47922321c1dca2f662eda61aa516b5fd852a985;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index d47922321..1902f7921 100644
--- 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;
 		}
-		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;
 		}
@@ -585,6 +585,7 @@ static void cleanup_card(struct net_device *dev)
 	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));
@@ -609,6 +610,7 @@ out:
 	free_netdev(dev);
 	return ERR_PTR(err);
 }
+#endif
 
 /**********************************************
  * init the chip (elmc-interrupt should be disabled?!)