You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
22 lines
771 B
Diff
22 lines
771 B
Diff
From dbdf9b1fe83f88090d88bce980885df4fac46162 Mon Sep 17 00:00:00 2001
|
|
From: Stuart Yoder <stuart.yoder@nxp.com>
|
|
Date: Thu, 25 Aug 2016 11:17:52 -0500
|
|
Subject: [PATCH 225/226] dpaa2-evb: fix 4.4 backport compile error
|
|
|
|
Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
|
|
---
|
|
drivers/staging/fsl-dpaa2/evb/evb.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/staging/fsl-dpaa2/evb/evb.c
|
|
+++ b/drivers/staging/fsl-dpaa2/evb/evb.c
|
|
@@ -1153,7 +1153,7 @@ static int evb_probe(struct fsl_mc_devic
|
|
}
|
|
|
|
rtnl_lock();
|
|
- err = netdev_master_upper_dev_link(port_netdev, netdev, NULL, NULL);
|
|
+ err = netdev_master_upper_dev_link(port_netdev, netdev);
|
|
if (unlikely(err)) {
|
|
dev_err(dev, "netdev_master_upper_dev_link err %d\n",
|
|
err);
|