[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c

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

diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index b3069ee34bd25587596a25692b87ecccbb4f4dd2..35d15e850075f18b4aebc28cf51fcd3095eabf7d 100644 (file)
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -47,7 +47,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/timer.h>
 #include <linux/platform_device.h>
-#include <linux/etherdevice.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -1541,6 +1540,7 @@ tsi108_init_one(struct platform_device *pdev)
        struct tsi108_prv_data *data = NULL;
        hw_info *einfo;
        int err = 0;
+       DECLARE_MAC_BUF(mac);
 
        einfo = pdev->dev.platform_data;
 
@@ -1608,7 +1608,6 @@ tsi108_init_one(struct platform_device *pdev)
         */
 
        dev->features = NETIF_F_HIGHDMA;
-       SET_MODULE_OWNER(dev);
 
        spin_lock_init(&data->txlock);
        spin_lock_init(&data->misclock);
@@ -1630,10 +1629,8 @@ tsi108_init_one(struct platform_device *pdev)
                goto register_fail;
        }
 
-       printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: "
-              "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
-              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_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n",
+              dev->name, print_mac(mac, dev->dev_addr));
 #ifdef DEBUG
        data->msg_enable = DEBUG;
        dump_eth_one(dev);