natsemi: fix MMIO for PPC 44x platforms

[safe/jmp/linux-2.6] / drivers / net / atp.c

diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index cec2e36..3d44333 100644 (file)
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -248,6 +248,7 @@ static int __init atp_probe1(long ioaddr)
        struct net_local *lp;
        int saved_ctrl_reg, status, i;
        int res;
+       DECLARE_MAC_BUF(mac);
 
        outb(0xff, ioaddr + PAR_DATA);
        /* Save the original value of the Control register, in case we guessed
@@ -322,10 +323,9 @@ static int __init atp_probe1(long ioaddr)
                printk(KERN_INFO "%s", version);
 #endif
 
-       printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM "
-                  "%02X:%02X:%02X:%02X:%02X:%02X.\n", dev->name, dev->base_addr,
-                  dev->irq, dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                  dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+       printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, "
+              "SAPROM %s.\n",
+              dev->name, dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr));
 
        /* Reset the ethernet hardware and activate the printer pass-through. */
        write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX);
@@ -378,8 +378,8 @@ static void __init get_node_ID(struct net_device *dev)
                sa_offset = 15;
 
        for (i = 0; i < 3; i++)
-               ((u16 *)dev->dev_addr)[i] =
-                       be16_to_cpu(eeprom_op(ioaddr, EE_READ(sa_offset + i)));
+               ((__be16 *)dev->dev_addr)[i] =
+                       cpu_to_be16(eeprom_op(ioaddr, EE_READ(sa_offset + i)));
 
        write_reg(ioaddr, CMR2, CMR2_NULL);
 }