cpuidle: make sysfs attributes sysdev class attributes

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

diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index 4b93902906ba71c1027ece6a2097ab8d43ea0c94..d454e143483ee39ad64ba0724753af67053527c0 100644 (file)
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -488,13 +488,6 @@ static void de620_set_multicast_list(struct net_device *dev)
 {
        if (dev->mc_count || dev->flags&(IFF_ALLMULTI|IFF_PROMISC))
        { /* Enable promiscuous mode */
-               /*
-                *      We must make the kernel realise we had to move
-                *      into promisc mode or we start all out war on
-                *      the cable. - AC
-                */
-               dev->flags|=IFF_PROMISC;
-
                de620_set_register(dev, W_TCR, (TCR_DEF & ~RXPBM) | RXALL);
        }
        else
@@ -807,6 +800,7 @@ struct net_device * __init de620_probe(int unit)
        struct net_device *dev;
        int err = -ENOMEM;
        int i;
+       DECLARE_MAC_BUF(mac);
 
        dev = alloc_etherdev(0);
        if (!dev)
@@ -853,13 +847,14 @@ struct net_device * __init de620_probe(int unit)
        }
 
        /* else, got it! */
-       printk(", Ethernet Address: %2.2X",
-               dev->dev_addr[0] = nic_data.NodeID[0]);
+       dev->dev_addr[0] = nic_data.NodeID[0];
        for (i = 1; i < ETH_ALEN; i++) {
-               printk(":%2.2X", dev->dev_addr[i] = nic_data.NodeID[i]);
+               dev->dev_addr[i] = nic_data.NodeID[i];
                dev->broadcast[i] = 0xff;
        }
 
+       printk(", Ethernet Address: %s", print_mac(mac, dev->dev_addr));
+
        printk(" (%dk RAM,",
                (nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64);