linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index f0512a4..01bdb23 100644 (file)
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -36,13 +36,12 @@ static char *version = "sun3lance.c: v1.2 1/12/2001  Sam Creasey (sammy@sammy.ne
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/setup.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/dvma.h>
 #include <asm/idprom.h>
 #include <asm/machines.h>
@@ -163,7 +162,7 @@ struct lance_private {
 #define        MEM     lp->mem
 #define        DREG    lp->iobase[0]
 #define        AREG    lp->iobase[1]
-#define        REGA(a) ( AREG = (a), DREG )
+#define        REGA(a) (*( AREG = (a), &DREG ))
 
 /* Definitions for the Lance */
 
@@ -390,7 +389,7 @@ static int __init lance_probe( struct net_device *dev)
        dev->stop = &lance_close;
        dev->get_stats = &lance_get_stats;
        dev->set_multicast_list = &set_multicast_list;
-       dev->set_mac_address = 0;
+       dev->set_mac_address = NULL;
 //     KLUDGE -- REMOVE ME
        set_bit(__LINK_STATE_PRESENT, &dev->state);