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

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

diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index e3fe0a7..1f7a27c 100644 (file)
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -43,6 +43,8 @@ static const char version[] =
 
 #include "8390.h"
 
+#define DRV_NAME "wd"
+
 /* A zero-terminated list of I/O addresses to be probed. */
 static unsigned int wd_portlist[] __initdata =
 {0x300, 0x280, 0x380, 0x240, 0};
@@ -131,6 +133,7 @@ static void cleanup_card(struct net_device *dev)
        release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
 }
 
+#ifndef MODULE
 struct net_device * __init wd_probe(int unit)
 {
        struct net_device *dev = alloc_ei_netdev();
@@ -155,6 +158,7 @@ out:
        free_netdev(dev);
        return ERR_PTR(err);
 }
+#endif
 
 static int __init wd_probe1(struct net_device *dev, int ioaddr)
 {
@@ -300,7 +304,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
 
        /* Snarf the interrupt now.  There's no point in waiting since we cannot
           share and the board will usually be enabled. */
-       i = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev);
+       i = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev);
        if (i) {
                printk (" unable to get IRQ %d.\n", dev->irq);
                return i;