diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-23 10:16:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-23 10:16:53 -0700 |
| commit | 1f8d31d189cc6ce1e4b972959fda41e790bb92b8 (patch) | |
| tree | fd3cca12a29319f073773ac55f7d41cc58e2c73f /drivers/net/ethernet/stmicro | |
| parent | 3fb5ec06578e4c85d3486b6a73cbeb07960a51ce (diff) | |
| parent | cd4175b11685b11c40e31a03e05084cc212b0649 (diff) | |
| download | linux-1f8d31d189cc6ce1e4b972959fda41e790bb92b8.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index a366b3747eeb..8a280b48e3a9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -315,6 +315,7 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, { .compatible = "allwinner,sun8i-h3-emac" }, { .compatible = "allwinner,sun8i-v3s-emac" }, { .compatible = "allwinner,sun50i-a64-emac" }, + {}, }; /* If phy-handle property is passed from DT, use it as the PHY */ |