diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-17 12:50:59 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-11-17 12:50:59 +1100 |
commit | 99c4abebe9678b76f61b9df4c2969b52ae9024fa (patch) | |
tree | ede4f1c5f454414774f5073566143abbe86d536b /drivers/net/hydra.c | |
parent | df8e83d6f4852377210deef989cfb4234efa4eae (diff) | |
parent | 6817ba2cd22cfed2e93d062dca3d7a82465d693d (diff) |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/hydra.c')
-rw-r--r-- | drivers/net/hydra.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c index b96cf2dcb109..b0ae0766ea4e 100644 --- a/drivers/net/hydra.c +++ b/drivers/net/hydra.c @@ -103,7 +103,6 @@ static int __devinit hydra_init(struct zorro_dev *z) int start_page, stop_page; int j; int err; - DECLARE_MAC_BUF(mac); static u32 hydra_offsets[16] = { 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, @@ -163,8 +162,8 @@ static int __devinit hydra_init(struct zorro_dev *z) zorro_set_drvdata(z, dev); printk(KERN_INFO "%s: Hydra at 0x%08lx, address " - "%s (hydra.c " HYDRA_VERSION ")\n", - dev->name, z->resource.start, print_mac(mac, dev->dev_addr)); + "%pM (hydra.c " HYDRA_VERSION ")\n", + dev->name, z->resource.start, dev->dev_addr); return 0; } |