sparc64: Don't MAGIC_SYSRQ ifdef smp_fetch_global_regs and support code.

[linux-2.6] / drivers / net / sunlance.c

diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 7bf5c90b7749e55de398b6223d82f23f5dfb3bb6..4e994f87469e4e9fc98ecec83a734c3778cc8c38 100644 (file)
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -915,15 +915,11 @@ static void build_fake_packet(struct lance_private *lp)
        lp->tx_new = TX_NEXT(entry);
 }
 
-struct net_device *last_dev;
-
 static int lance_open(struct net_device *dev)
 {
        struct lance_private *lp = netdev_priv(dev);
        int status = 0;
 
-       last_dev = dev;
-
        STOP_LANCE(lp);
 
        if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED,
@@ -1321,6 +1317,7 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
        struct net_device *dev;
        struct lance_private *lp;
        int    i;
+       DECLARE_MAC_BUF(mac);
 
        dev = alloc_etherdev(sizeof(struct lance_private) + 8);
        if (!dev)
@@ -1478,12 +1475,8 @@ no_link_test:
 
        dev_set_drvdata(&sdev->ofdev.dev, lp);
 
-       printk(KERN_INFO "%s: LANCE ", dev->name);
-
-       for (i = 0; i < 6; i++)
-               printk("%2.2x%c", dev->dev_addr[i],
-                      i == 5 ? ' ': ':');
-       printk("\n");
+       printk(KERN_INFO "%s: LANCE %s\n",
+              dev->name, print_mac(mac, dev->dev_addr));
 
        return 0;