make sure ucc_geth.c fixed-link support still works in net-next
Subsystems (2)
Anton, Andy
Can you take a look at the recent net-next tree and make sure that the merge between the fsl_pq_mdio.c support and the patch that went into 2.6.29 to fix fixed-link support in ucc_geth.c is correct and still works.
See commits:
Merge branch master... (8be7cdccacfbfc707e7370cad9bb168defed636f) ucc_geth: Fix merge error. (039a6f6a39d2aa30ee53afdb213ea6dd4482928b)
- k
PATCH 1/1 ucc_geth: Fix build breakage caused by a merge
This patch fixes following build error:
CC ucc_geth.oucc_geth.c: In function 'ucc_geth_probe':
ucc_geth.c:3644: error: implicit declaration of function 'uec_mdio_bus_name' make[2]: *** [ucc_geth.o] Error 1
---
Quoted 10 lines · Kumar Gala
Anton, Andy
Can you take a look at the recent net-next tree and make sure that the merge between the
fsl_pq_mdio.csupport and the patch that went into 2.6.29 to fix fixed-link support inucc_geth.cis correct and still works.See commits:
Merge branch master... (8be7cdccacfbfc707e7370cad9bb168defed636f) ucc_geth: Fix merge error. (039a6f6a39d2aa30ee53afdb213ea6dd4482928b)
Thanks for heads up, there is indeed a small issue.
drivers/net/ucc_geth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ucc_geth.c +1 -1
@@ -3641,7 +3641,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *maif (err)return -1 ; -uec_mdio_bus_name (bus_name, mdio); +fsl_pq_mdio_bus_name (bus_name, mdio);snprintf (ug_info->phy_bus_id,sizeof (ug_info->phy_bus_id),"%s:%02x" , bus_name, *prop); }
Signature · 1 line
1.5.6.5
Re: [PATCH] ucc_geth: Fix build breakage caused by a merge
From: Anton Vorontsov <[email protected]>
Date: Tue, 24 Mar 2009 18:37:34 +0300
Quoted 8 lines
This patch fixes following build error:
CC ucc_geth.o
ucc_geth.c: In function 'ucc_geth_probe':
ucc_geth.c:3644: error: implicit declaration of function 'uec_mdio_bus_name' make[2]: *** [ucc_geth.o] Error 1Signed-off-by Anton Vorontsov <[email protected]>
Applied, thanks Anton.