diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 09:13:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 09:13:41 +0200 |
| commit | 6bfb591cc11ddc297ac8dcb0fc4ecab310ee6b1e (patch) | |
| tree | f91bbc3b151cd0bb3065fcfc1330ba393a83fd26 /drivers/net | |
| parent | 336dcea5a1f07885ce787a74b928604dd8e2645e (diff) | |
| parent | ad741d94b31bcba922e69d1a325d50eaaccf0080 (diff) | |
| download | barebox-6bfb591cc11ddc297ac8dcb0fc4ecab310ee6b1e.tar.gz barebox-6bfb591cc11ddc297ac8dcb0fc4ecab310ee6b1e.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/micrel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index e8a566deba..9a30cb7e90 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -357,7 +357,7 @@ static struct phy_driver ksphy_driver[] = { .phy_id_mask = MICREL_PHY_ID_MASK, .drv.name = "Micrel KSZ8081/91", .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), - .config_init = kszphy_config_init, + .config_init = ksz8021_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, }, { |