Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[pandora-kernel.git] / drivers / net / mvme147.c

diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c
index e246d00..06ca425 100644 (file)
--- a/drivers/net/mvme147.c
+++ b/drivers/net/mvme147.c
@@ -67,6 +67,7 @@ struct net_device * __init mvme147lance_probe(int unit)
        u_long *addr;
        u_long address;
        int err;
+       DECLARE_MAC_BUF(mac);
 
        if (!MACH_IS_MVME147 || called)
                return ERR_PTR(-ENODEV);
@@ -79,14 +80,11 @@ struct net_device * __init mvme147lance_probe(int unit)
        if (unit >= 0)
                sprintf(dev->name, "eth%d", unit);
 
-       SET_MODULE_OWNER(dev);
-
        /* Fill the dev fields */
        dev->base_addr = (unsigned long)MVME147_LANCE_BASE;
        dev->open = &m147lance_open;
        dev->stop = &m147lance_close;
        dev->hard_start_xmit = &lance_start_xmit;
-       dev->get_stats = &lance_get_stats;
        dev->set_multicast_list = &lance_set_multicast;
        dev->tx_timeout = &lance_tx_timeout;
        dev->dma = 0;
@@ -103,12 +101,10 @@ struct net_device * __init mvme147lance_probe(int unit)
        address=address>>8;
        dev->dev_addr[3]=address&0xff;
 
-       printk("%s: MVME147 at 0x%08lx, irq %d, Hardware Address %02x:%02x:%02x:%02x:%02x:%02x\n",
-               dev->name, dev->base_addr, MVME147_LANCE_IRQ,
-               dev->dev_addr[0],
-               dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4],
-               dev->dev_addr[5]);
+       printk("%s: MVME147 at 0x%08lx, irq %d, "
+              "Hardware Address %s\n",
+              dev->name, dev->base_addr, MVME147_LANCE_IRQ,
+              print_mac(mac, dev->dev_addr));
 
        lp = (struct m147lance_private *)dev->priv;
        lp->ram = __get_dma_pages(GFP_ATOMIC, 3);       /* 16K */