diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-15 15:15:17 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-15 15:15:17 -0700 |
commit | c337ffb68e1e71bad069b14d2246fa1e0c31699c (patch) | |
tree | 7861a59b196adfd63758cc0921e4fb56030fbaf3 /drivers/net/smsc911x.c | |
parent | 30df754dedebf27ef90452944a723ba058d23396 (diff) | |
parent | 84c0c6933cb0303fa006992a6659c2b46de4eb17 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/smsc911x.c')
-rw-r--r-- | drivers/net/smsc911x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index d70bde95460b..1566259c1f27 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c @@ -791,8 +791,8 @@ static int smsc911x_mii_probe(struct net_device *dev) return -ENODEV; } - SMSC_TRACE(PROBE, "PHY %d: addr %d, phy_id 0x%08X", - phy_addr, phydev->addr, phydev->phy_id); + SMSC_TRACE(PROBE, "PHY: addr %d, phy_id 0x%08X", + phydev->addr, phydev->phy_id); ret = phy_connect_direct(dev, phydev, &smsc911x_phy_adjust_link, 0, |