Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'

[u-boot] / drivers / net / phy / smsc.c

diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 5936f9bd7f31f18b2a53a369b2130eb7a86caa15..bfd9815abf9b68dcb52eb11cb5ed9ec38f559c97 100644 (file)
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -7,11 +7,12 @@
  *   Copyright 2010-2011 Freescale Semiconductor, Inc.
  *   author Andy Fleming
  *
- * Some code get from linux kenrel
+ * Some code copied from linux kernel
  * Copyright (c) 2006 Herbert Valerio Riedel <hvr@gnu.org>
  */
 #include <miiphy.h>
 
+/* This code does not check the partner abilities. */
 static int smsc_parse_status(struct phy_device *phydev)
 {
        int mii_reg;
@@ -64,7 +65,7 @@ static struct phy_driver lan8710_driver = {
        .mask = 0xffff0,
        .features = PHY_BASIC_FEATURES,
        .config = &genphy_config_aneg,
-       .startup = &smsc_startup,
+       .startup = &genphy_startup,
        .shutdown = &genphy_shutdown,
 };