Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-09-23 10:16:53 -07:00
parent 3fb5ec0657 cd4175b116
commit 1f8d31d189
322 changed files with 5654 additions and 1907 deletions
--- 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 */