bnx2x: PBA Table Page Alignment Workaround

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

diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index cef365881ac21224e806b0ebf9520360b30a3d47..6f9aa1643743ebca435def239abd16c13f86ffde 100644 (file)
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -156,6 +156,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
        int word16 = 0;                         /* 0 = 8 bit, 1 = 16 bit */
        const char *model_name;
        static unsigned version_printed;
+       DECLARE_MAC_BUF(mac);
 
        for (i = 0; i < 8; i++)
                checksum += inb(ioaddr + 8 + i);
@@ -174,9 +175,11 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
        if (ei_debug  &&  version_printed++ == 0)
                printk(version);
 
-       printk("%s: WD80x3 at %#3x,", dev->name, ioaddr);
        for (i = 0; i < 6; i++)
-               printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+               dev->dev_addr[i] = inb(ioaddr + 8 + i);
+
+       printk("%s: WD80x3 at %#3x, %s",
+              dev->name, ioaddr, print_mac(mac, dev->dev_addr));
 
        /* The following PureData probe code was contributed by
           Mike Jagdis <jaggy@purplet.demon.co.uk>. Puredata does software
@@ -334,7 +337,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
 #ifdef CONFIG_NET_POLL_CONTROLLER
        dev->poll_controller = ei_poll;
 #endif
-       NS8390_init(dev, 0);
+       NS8390p_init(dev, 0);
 
 #if 1
        /* Enable interrupt generation on softconfig cards -- M.U */