diff --git a/[refs] b/[refs] index 0f66ec57e882..1777b08ec724 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20501a69818827884b4381cdcedefdb5e7892915 +refs/heads/master: f3073ac76755abd63b1d4c3d145f4c15b65b5355 diff --git a/trunk/drivers/net/smc911x.c b/trunk/drivers/net/smc911x.c index 02cc064c2c8b..3d19d00e8eec 100644 --- a/trunk/drivers/net/smc911x.c +++ b/trunk/drivers/net/smc911x.c @@ -722,6 +722,9 @@ static void smc911x_phy_detect(struct net_device *dev) break; } } + if (phyaddr < 32) + /* Found an external PHY */ + break; } default: /* Internal media only */