VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / net / e2100.c

diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index 71c632b..7fc9860 100644 (file)
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -51,6 +51,8 @@ static const char version[] =
 
 #include "8390.h"
 
+#define DRV_NAME "e2100"
+
 static int e21_probe_list[] = {0x300, 0x280, 0x380, 0x220, 0};
 
 /* Offsets from the base_addr.
@@ -144,6 +146,7 @@ static void cleanup_card(struct net_device *dev)
        release_region(dev->base_addr, E21_IO_EXTENT);
 }
 
+#ifndef MODULE
 struct net_device * __init e2100_probe(int unit)
 {
        struct net_device *dev = alloc_ei_netdev();
@@ -168,6 +171,7 @@ out:
        free_netdev(dev);
        return ERR_PTR(err);
 }
+#endif
 
 static int __init e21_probe1(struct net_device *dev, int ioaddr)
 {
@@ -175,7 +179,7 @@ static int __init e21_probe1(struct net_device *dev, int ioaddr)
        unsigned char *station_addr = dev->dev_addr;
        static unsigned version_printed;
 
-       if (!request_region(ioaddr, E21_IO_EXTENT, dev->name))
+       if (!request_region(ioaddr, E21_IO_EXTENT, DRV_NAME))
                return -EBUSY;
 
        /* First check the station address for the Ctron prefix. */