Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[cascardo/linux.git] / drivers / net / sis900.c

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 5da8e67..0857d2c 100644 (file)
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -404,6 +404,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
        int i, ret;
        const char *card_name = card_names[pci_id->driver_data];
        const char *dev_name = pci_name(pci_dev);
+       DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -533,11 +534,9 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
                goto err_unmap_rx;
 
        /* print some information about our NIC */
-       printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ", net_dev->name,
-              card_name, ioaddr, net_dev->irq);
-       for (i = 0; i < 5; i++)
-               printk("%2.2x:", (u8)net_dev->dev_addr[i]);
-       printk("%2.2x.\n", net_dev->dev_addr[i]);
+       printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n",
+              net_dev->name, card_name, ioaddr, net_dev->irq,
+              print_mac(mac, net_dev->dev_addr));
 
        /* Detect Wake on Lan support */
        ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27;