Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / drivers / net / tokenring / abyss.c

diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 649d8ea..7a7de04 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.
@@ -97,8 +97,9 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
        static int versionprinted;
        struct net_device *dev;
        struct net_local *tp;
-       int i, ret, pci_irq_line;
+       int ret, pci_irq_line;
        unsigned long pci_ioaddr;
+       DECLARE_MAC_BUF(mac);
        
        if (versionprinted++ == 0)
                printk("%s", version);
@@ -116,14 +117,12 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
        if (!dev)
                return -ENOMEM;
 
-       SET_MODULE_OWNER(dev);
-
        if (!request_region(pci_ioaddr, ABYSS_IO_EXTENT, dev->name)) {
                ret = -EBUSY;
                goto err_out_trdev;
        }
                
-       ret = request_irq(pdev->irq, tms380tr_interrupt, SA_SHIRQ,
+       ret = request_irq(pdev->irq, tms380tr_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (ret)
                goto err_out_region;
@@ -147,12 +146,9 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
        }
 
        abyss_read_eeprom(dev);
-               
-       printk("%s:    Ring Station Address: ", dev->name);
-       printk("%2.2x", dev->dev_addr[0]);
-       for (i = 1; i < 6; i++)
-               printk(":%2.2x", dev->dev_addr[i]);
-       printk("\n");
+
+       printk("%s:    Ring Station Address: %s\n",
+              dev->name, print_mac(mac, dev->dev_addr));
 
        tp = netdev_priv(dev);
        tp->setnselout = abyss_setnselout_pins;