[U-Boot] [PATCH 1/6] net: merge bugfix: Marvell Kirkwood gigabit ethernet driver
This patch looks okay on u-boot-net.git/next branch but when it was merged to u-boot.git/master the last line is missing
Signed-off-by: Prafulla Wadaskar prafulla@marvell.com --- drivers/net/kirkwood_egiga.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/kirkwood_egiga.c index b43bbf2..3c5db19 100644 --- a/drivers/net/kirkwood_egiga.c +++ b/drivers/net/kirkwood_egiga.c @@ -662,3 +662,4 @@ int kirkwood_egiga_initialize(bd_t * bis) #endif } return 0; +}
On 20:54 Mon 29 Jun , Prafulla Wadaskar wrote:
This patch looks okay on u-boot-net.git/next branch but when it was merged to u-boot.git/master the last line is missing
Signed-off-by: Prafulla Wadaskar prafulla@marvell.com
drivers/net/kirkwood_egiga.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Ben is ok If I apply it?
Best Regards, J.
Jean-Christophe PLAGNIOL-VILLARD wrote:
On 20:54 Mon 29 Jun , Prafulla Wadaskar wrote:
This patch looks okay on u-boot-net.git/next branch but when it was merged to u-boot.git/master the last line is missing
Signed-off-by: Prafulla Wadaskar prafulla@marvell.com
drivers/net/kirkwood_egiga.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Ben is ok If I apply it?
Best Regards, J.
OK.
regards, Ben
On 20:54 Mon 29 Jun , Prafulla Wadaskar wrote:
This patch looks okay on u-boot-net.git/next branch but when it was merged to u-boot.git/master the last line is missing
Signed-off-by: Prafulla Wadaskar prafulla@marvell.com
drivers/net/kirkwood_egiga.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
applied to u-boot-arm
Best Regards, J.
participants (3)
-
Ben Warren -
Jean-Christophe PLAGNIOL-VILLARD -
Prafulla Wadaskar