diff --git a/[refs] b/[refs] index 8fdd4ad507b2..b82689c826d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5cacb3bf91b0841e5a721ca303658a407d5c34f +refs/heads/master: 150899d29367eb60302bcb710e779617d04aceea diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c index 6da678129828..eb7db032a780 100644 --- a/trunk/drivers/net/smsc911x.c +++ b/trunk/drivers/net/smsc911x.c @@ -317,7 +317,7 @@ static int smsc911x_mii_read(struct mii_bus *bus, int phyaddr, int regidx) goto out; } - SMSC_WARNING(HW, "Timed out waiting for MII write to finish"); + SMSC_WARNING(HW, "Timed out waiting for MII read to finish"); reg = -EIO; out: