ath9k: Enable MIB and TIM interrupts for station mode.

[pandora-kernel.git] / drivers / net / xtsonic.c

diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c
index da42aa0..a12a721 100644 (file)
--- a/drivers/net/xtsonic.c
+++ b/drivers/net/xtsonic.c
@@ -183,7 +183,7 @@ static int __init sonic_probe1(struct net_device *dev)
 
        if (lp->descriptors == NULL) {
                printk(KERN_ERR "%s: couldn't alloc DMA memory for "
-                               " descriptors.\n", lp->device->bus_id);
+                               " descriptors.\n", dev_name(lp->device));
                goto out;
        }
 
@@ -239,8 +239,6 @@ int __init xtsonic_probe(struct platform_device *pdev)
        struct resource *resmem, *resirq;
        int err = 0;
 
-       DECLARE_MAC_BUF(mac);
-
        if ((resmem = platform_get_resource(pdev, IORESOURCE_MEM, 0)) == NULL)
                return -ENODEV;
 
@@ -263,8 +261,8 @@ int __init xtsonic_probe(struct platform_device *pdev)
        if ((err = register_netdev(dev)))
                goto out1;
 
-       printk("%s: SONIC ethernet @%08lx, MAC %s, IRQ %d\n", dev->name,
-              dev->base_addr, print_mac(mac, dev->dev_addr), dev->irq);
+       printk("%s: SONIC ethernet @%08lx, MAC %pM, IRQ %d\n", dev->name,
+              dev->base_addr, dev->dev_addr, dev->irq);
 
        return 0;