Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / pcmcia / 3c574_cs.c

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index c7bd9c1c7f31a0aeed77ff659ee2c6d81151e736..73dcbb7296dad2fa20d3b71cc5d3729c2a7d5724 100644 (file)
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -343,6 +343,7 @@ static int tc574_config(struct pcmcia_device *link)
        u16 *phys_addr;
        char *cardname;
        union wn3_config config;
+       DECLARE_MAC_BUF(mac);
 
        phys_addr = (u16 *)dev->dev_addr;
 
@@ -458,10 +459,10 @@ static int tc574_config(struct pcmcia_device *link)
 
        strcpy(lp->node.dev_name, dev->name);
 
-       printk(KERN_INFO "%s: %s at io %#3lx, irq %d, hw_addr ",
-                  dev->name, cardname, dev->base_addr, dev->irq);
-       for (i = 0; i < 6; i++)
-               printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : ".\n"));
+       printk(KERN_INFO "%s: %s at io %#3lx, irq %d, "
+              "hw_addr %s.\n",
+              dev->name, cardname, dev->base_addr, dev->irq,
+              print_mac(mac, dev->dev_addr));
        printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n",
                   8 << config.u.ram_size, ram_split[config.u.ram_split],
                   config.u.autoselect ? "autoselect " : "");
@@ -1056,7 +1057,6 @@ static int el3_rx(struct net_device *dev, int worklimit)
                        DEBUG(3, "  Receiving packet size %d status %4.4x.\n",
                                  pkt_len, rx_status);
                        if (skb != NULL) {
-                               skb->dev = dev;
                                skb_reserve(skb, 2);
                                insl(ioaddr+RX_FIFO, skb_put(skb, pkt_len),
                                                ((pkt_len+3)>>2));