7225-dpaa2-evb-fix-4.4-backport-compile-error.patch 771 B

123456789101112131415161718192021
  1. From dbdf9b1fe83f88090d88bce980885df4fac46162 Mon Sep 17 00:00:00 2001
  2. From: Stuart Yoder <stuart.yoder@nxp.com>
  3. Date: Thu, 25 Aug 2016 11:17:52 -0500
  4. Subject: [PATCH 225/226] dpaa2-evb: fix 4.4 backport compile error
  5. Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
  6. ---
  7. drivers/staging/fsl-dpaa2/evb/evb.c | 2 +-
  8. 1 file changed, 1 insertion(+), 1 deletion(-)
  9. --- a/drivers/staging/fsl-dpaa2/evb/evb.c
  10. +++ b/drivers/staging/fsl-dpaa2/evb/evb.c
  11. @@ -1153,7 +1153,7 @@ static int evb_probe(struct fsl_mc_devic
  12. }
  13. rtnl_lock();
  14. - err = netdev_master_upper_dev_link(port_netdev, netdev, NULL, NULL);
  15. + err = netdev_master_upper_dev_link(port_netdev, netdev);
  16. if (unlikely(err)) {
  17. dev_err(dev, "netdev_master_upper_dev_link err %d\n",
  18. err);