Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

1 files changed, 12 insertions, 19 deletions

diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index 8e884869a05b..f8fa0c3f0f64 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -304,7 +304,7 @@ struct net_device * __init mac8390_probe(int unit)
         if (!MACH_IS_MAC)
                 return ERR_PTR(-ENODEV);
 
-        dev = alloc_ei_netdev();
+        dev = ____alloc_ei_netdev(0);
         if (!dev)
                 return ERR_PTR(-ENOMEM);
 
@@ -481,15 +481,15 @@ void cleanup_module(void)
 static const struct net_device_ops mac8390_netdev_ops = {
         .ndo_open               = mac8390_open,
         .ndo_stop               = mac8390_close,
-        .ndo_start_xmit         = ei_start_xmit,
-        .ndo_tx_timeout         = ei_tx_timeout,
-        .ndo_get_stats          = ei_get_stats,
-        .ndo_set_multicast_list = ei_set_multicast_list,
+        .ndo_start_xmit         = __ei_start_xmit,
+        .ndo_tx_timeout         = __ei_tx_timeout,
+        .ndo_get_stats          = __ei_get_stats,
+        .ndo_set_multicast_list = __ei_set_multicast_list,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_change_mtu         = eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
-        .ndo_poll_controller    = ei_poll,
+        .ndo_poll_controller    = __ei_poll,
 #endif
 };
 
@@ -620,19 +620,12 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd
 
         /* Good, done, now spit out some messages */
         printk(KERN_INFO "%s: %s in slot %X (type %s)\n",
-                   dev->name, ndev->board->name, ndev->board->slot, cardname[type]);
-        printk(KERN_INFO "MAC ");
-        {
-                int i;
-                for (i = 0; i < 6; i++) {
-                        printk("%2.2x", dev->dev_addr[i]);
-                        if (i < 5)
-                                printk(":");
-                }
-        }
-        printk(" IRQ %d, %d KB shared memory at %#lx,  %d-bit access.\n",
-                   dev->irq, (int)((dev->mem_end - dev->mem_start)/0x1000) * 4,
-                   dev->mem_start, access_bitmode?32:16);
+               dev->name, ndev->board->name, ndev->board->slot, cardname[type]);
+        printk(KERN_INFO
+               "MAC %pM IRQ %d, %d KB shared memory at %#lx, %d-bit access.\n",
+               dev->dev_addr, dev->irq,
+               (unsigned int)(dev->mem_end - dev->mem_start) >> 10,
+               dev->mem_start, access_bitmode ? 32 : 16);
         return 0;
 }