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

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

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 92cf5e0..c835712 100644 (file)
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -58,11 +58,12 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 
 static char version[] __initdata =
        "82596.c $Revision: 1.5 $\n";
 
+#define DRV_NAME       "82596"
+
 /* DEBUG flags
  */
 
@@ -618,7 +619,7 @@ static int init_i596_mem(struct net_device *dev)
 #endif
        unsigned long flags;
 
-       MPU_PORT(dev, PORT_RESET, 0);
+       MPU_PORT(dev, PORT_RESET, NULL);
 
        udelay(100);            /* Wait 100us - seems to help */
 
@@ -759,7 +760,7 @@ static int init_i596_mem(struct net_device *dev)
 
 failed:
        printk(KERN_CRIT "%s: Failed to initialise 82596\n", dev->name);
-       MPU_PORT(dev, PORT_RESET, 0);
+       MPU_PORT(dev, PORT_RESET, NULL);
        return -1;
 }
 
@@ -1191,7 +1192,7 @@ struct net_device * __init i82596_probe(int unit)
                /* this is easy the ethernet interface can only be at 0x300 */
                /* first check nothing is already registered here */
 
-               if (!request_region(ioaddr, I596_TOTAL_SIZE, dev->name)) {
+               if (!request_region(ioaddr, I596_TOTAL_SIZE, DRV_NAME)) {
                        printk(KERN_ERR "82596: IO address 0x%04x in use\n", ioaddr);
                        err = -EBUSY;
                        goto out;