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

2016-12-10 16:21:55 -05:00
parent 3174fed982 045169816b
commit 821781a9f4
80 changed files with 864 additions and 280 deletions
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1112,6 +1112,7 @@ static int cpmac_probe(struct platform_device *pdev)
 	if (!dev)
 		return -ENOMEM;

+	SET_NETDEV_DEV(dev, &pdev->dev);
 	platform_set_drvdata(pdev, dev);
 	priv = netdev_priv(dev);