diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-24 18:59:02 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-24 18:59:02 +0300 |
| commit | 2ee490a0245b65826a8ce8e42e34c9bf805d3656 (patch) | |
| tree | c53f7d3513bd284b181d3aaa61534a0d62751884 /drivers/net/phy/phy.c | |
| parent | ec8fb48ce98987065493b27422200897cf0909f8 (diff) | |
| parent | 0a71cd77290ca317ecf6f15984a91abbee741e09 (diff) | |
| download | u-boot-2ee490a0245b65826a8ce8e42e34c9bf805d3656.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/zynq_gem.c
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 4b6c09f88e..80bdfb6d9d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -461,6 +461,9 @@ static LIST_HEAD(phy_drivers); int phy_init(void) { +#ifdef CONFIG_MV88E61XX_SWITCH + phy_mv88e61xx_init(); +#endif #ifdef CONFIG_PHY_AQUANTIA phy_aquantia_init(); #endif |