|
@@ -775,7 +775,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
/* bring up the dma engine and IP core */
|
|
/* bring up the dma engine and IP core */
|
|
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
|
|
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
|
|
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
|
|
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
|
|
-@@ -2700,7 +2700,6 @@ static int mv643xx_eth_shared_of_add_por
|
|
|
|
|
|
+@@ -2701,7 +2701,6 @@ static int mv643xx_eth_shared_of_add_por
|
|
struct platform_device *ppdev;
|
|
struct platform_device *ppdev;
|
|
struct mv643xx_eth_platform_data ppd;
|
|
struct mv643xx_eth_platform_data ppd;
|
|
struct resource res;
|
|
struct resource res;
|
|
@@ -783,7 +783,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
int ret;
|
|
int ret;
|
|
int dev_num = 0;
|
|
int dev_num = 0;
|
|
|
|
|
|
-@@ -2731,9 +2730,7 @@ static int mv643xx_eth_shared_of_add_por
|
|
|
|
|
|
+@@ -2732,9 +2731,7 @@ static int mv643xx_eth_shared_of_add_por
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1250,7 +1250,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
|
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
|
|
-@@ -372,7 +372,7 @@ static int meson8b_dwmac_probe(struct pl
|
|
|
|
|
|
+@@ -370,7 +370,7 @@ static int meson8b_dwmac_probe(struct pl
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
@@ -1455,7 +1455,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
of_node_put(node);
|
|
of_node_put(node);
|
|
--- a/drivers/net/ethernet/ti/cpsw.c
|
|
--- a/drivers/net/ethernet/ti/cpsw.c
|
|
+++ b/drivers/net/ethernet/ti/cpsw.c
|
|
+++ b/drivers/net/ethernet/ti/cpsw.c
|
|
-@@ -1306,7 +1306,6 @@ static int cpsw_probe_dt(struct cpsw_pla
|
|
|
|
|
|
+@@ -1308,7 +1308,6 @@ static int cpsw_probe_dt(struct cpsw_pla
|
|
|
|
|
|
for_each_available_child_of_node(node, slave_node) {
|
|
for_each_available_child_of_node(node, slave_node) {
|
|
struct cpsw_slave_data *slave_data = data->slave_data + i;
|
|
struct cpsw_slave_data *slave_data = data->slave_data + i;
|
|
@@ -1463,7 +1463,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
int lenp;
|
|
int lenp;
|
|
const __be32 *parp;
|
|
const __be32 *parp;
|
|
|
|
|
|
-@@ -1378,10 +1377,8 @@ static int cpsw_probe_dt(struct cpsw_pla
|
|
|
|
|
|
+@@ -1380,10 +1379,8 @@ static int cpsw_probe_dt(struct cpsw_pla
|
|
}
|
|
}
|
|
|
|
|
|
no_phy_slave:
|
|
no_phy_slave:
|