Merge branch 'upstream-fixes'

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

diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 1f43bbfbc1c78af3a95902ed37d602623b1ab292..01bdb23340584bf6576d9a63b90f5a92645110df 100644 (file)
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -162,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 */
 
@@ -389,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);