diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:03:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:06:46 +1100 |
| commit | cf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch) | |
| tree | 8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /drivers/net/smc-ultra32.c | |
| parent | eabeb7dac4934602a90b14649c07c13eb7e43d90 (diff) | |
| parent | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff) | |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/smc-ultra32.c')
| -rw-r--r-- | drivers/net/smc-ultra32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c index a5a91ace28cc..cb6c097a2e0a 100644 --- a/drivers/net/smc-ultra32.c +++ b/drivers/net/smc-ultra32.c @@ -163,7 +163,6 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr) unsigned char idreg; unsigned char reg4; const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"}; - DECLARE_MAC_BUF(mac); if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME)) return -EBUSY; @@ -207,8 +206,8 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr) for (i = 0; i < 6; i++) dev->dev_addr[i] = inb(ioaddr + 8 + i); - printk("%s: %s at 0x%X, %s", - dev->name, model_name, ioaddr, print_mac(mac, dev->dev_addr)); + printk("%s: %s at 0x%X, %pM", + dev->name, model_name, ioaddr, dev->dev_addr); /* Switch from the station address to the alternate register set and read the useful registers there. */ |