Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / 3c507.c

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 3d06271c3a8b1a09b0aa18f8be542a876a5b1ad7..964d31ac9449a2b90e1bc5921e774468d4e23a1c 100644 (file)
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -357,6 +357,7 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
        static unsigned char init_ID_done, version_printed;
        int i, irq, irqval, retval;
        struct net_local *lp;
+       DECLARE_MAC_BUF(mac);
 
        if (init_ID_done == 0) {
                ushort lrs_state = 0xff;
@@ -402,10 +403,9 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
        dev->base_addr = ioaddr;
 
        outb(0x01, ioaddr + MISC_CTRL);
-       for (i = 0; i < 6; i++) {
+       for (i = 0; i < 6; i++)
                dev->dev_addr[i] = inb(ioaddr + i);
-               printk(" %02x", dev->dev_addr[i]);
-       }
+       printk(" %s", print_mac(mac, dev->dev_addr));
 
        if (mem_start)
                net_debug = mem_start & 7;