HID: proper handling of MS 4k and 6k devices

[linux-2.6] / drivers / net / 3c505.c

diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index acede307c05d4242ca3b1671e7a2ec11a6613d13..9c6573419f5a3174d67b0ec92462983c3abcb315 100644 (file)
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -1386,8 +1386,7 @@ static int __init elplus_setup(struct net_device *dev)
        unsigned long timeout;
        unsigned long cookie = 0;
        int err = -ENODEV;
-
-       SET_MODULE_OWNER(dev);
+       DECLARE_MAC_BUF(mac);
 
        /*
         *  setup adapter structure
@@ -1523,11 +1522,10 @@ static int __init elplus_setup(struct net_device *dev)
        /*
         * print remainder of startup message
         */
-       printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, ",
-              dev->name, dev->base_addr, dev->irq, dev->dma);
-       printk("addr %02x:%02x:%02x:%02x:%02x:%02x, ",
-              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(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, "
+              "addr %s, ",
+              dev->name, dev->base_addr, dev->irq, dev->dma,
+              print_mac(mac, dev->dev_addr));
 
        /*
         * read more information from the adapter