Merge branch 'devel' into next

[linux-2.6-omap-h63xx.git] / drivers / net / tokenring / abyss.c

diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 124cfd4fbcf4f7004941dadefff88345c9320a11..b566d6d79ecdbe7ce0a5f58f7546f50e77600ec5 100644 (file)
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -10,7 +10,7 @@
  *      - Madge Smart 16/4 PCI Mk2
  *
  *  Maintainer(s):
- *    AF       Adam Fritzler           mid@auk.cx
+ *    AF       Adam Fritzler
  *
  *  Modification History:
  *     30-Dec-99       AF      Split off from the tms380tr driver.
@@ -99,7 +99,6 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
        struct net_local *tp;
        int ret, pci_irq_line;
        unsigned long pci_ioaddr;
-       DECLARE_MAC_BUF(mac);
        
        if (versionprinted++ == 0)
                printk("%s", version);
@@ -147,8 +146,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
 
        abyss_read_eeprom(dev);
 
-       printk("%s:    Ring Station Address: %s\n",
-              dev->name, print_mac(mac, dev->dev_addr));
+       printk("%s:    Ring Station Address: %pM\n", dev->name, dev->dev_addr);
 
        tp = netdev_priv(dev);
        tp->setnselout = abyss_setnselout_pins;