--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -4527,7 +4527,6 @@ static irqreturn_t dpni_irq0_handler_thr
+@@ -4530,7 +4530,6 @@ static irqreturn_t dpni_irq0_handler_thr
dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
dpaa2_eth_update_tx_fqids(priv);
/* We can avoid locking because the "endpoint changed" IRQ
* handler is the only one who changes priv->mac at runtime,
* so we are not racing with anyone.
-@@ -4537,7 +4536,6 @@ static irqreturn_t dpni_irq0_handler_thr
+@@ -4540,7 +4539,6 @@ static irqreturn_t dpni_irq0_handler_thr
dpaa2_eth_disconnect_mac(priv);
else
dpaa2_eth_connect_mac(priv);
}
return IRQ_HANDLED;
-@@ -4856,9 +4854,7 @@ static int dpaa2_eth_remove(struct fsl_m
+@@ -4859,9 +4857,7 @@ static int dpaa2_eth_remove(struct fsl_m
else
fsl_mc_free_irqs(ls_dev);