* make sure ucc_geth.c fixed-link support still works in net-next @ 2009-03-24 13:15 Kumar Gala 2009-03-24 15:37 ` [PATCH] ucc_geth: Fix build breakage caused by a merge Anton Vorontsov 0 siblings, 1 reply; 3+ messages in thread From: Kumar Gala @ 2009-03-24 13:15 UTC (permalink / raw) To: Anton Vorontsov, Andy Fleming Cc: LinuxPPC Mailing List, Joakim Tjernlund, netdev 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ucc_geth: Fix build breakage caused by a merge 2009-03-24 13:15 make sure ucc_geth.c fixed-link support still works in net-next Kumar Gala @ 2009-03-24 15:37 ` Anton Vorontsov 2009-03-24 19:07 ` David Miller 0 siblings, 1 reply; 3+ messages in thread From: Anton Vorontsov @ 2009-03-24 15:37 UTC (permalink / raw) To: David Miller Cc: LinuxPPC Mailing List, Andy Fleming, Joakim Tjernlund, netdev 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 1 Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> --- On Tue, Mar 24, 2009 at 08:15:13AM -0500, Kumar Gala wrote: > 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) Thanks for heads up, there is indeed a small issue. drivers/net/ucc_geth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 5f866e2..0b67512 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -3641,7 +3641,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma if (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); } -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ucc_geth: Fix build breakage caused by a merge 2009-03-24 15:37 ` [PATCH] ucc_geth: Fix build breakage caused by a merge Anton Vorontsov @ 2009-03-24 19:07 ` David Miller 0 siblings, 0 replies; 3+ messages in thread From: David Miller @ 2009-03-24 19:07 UTC (permalink / raw) To: avorontsov; +Cc: linuxppc-dev, afleming, Joakim.Tjernlund, netdev From: Anton Vorontsov <avorontsov@ru.mvista.com> Date: Tue, 24 Mar 2009 18:37:34 +0300 > 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 1 > > Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Applied, thanks Anton. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-03-24 19:07 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-03-24 13:15 make sure ucc_geth.c fixed-link support still works in net-next Kumar Gala 2009-03-24 15:37 ` [PATCH] ucc_geth: Fix build breakage caused by a merge Anton Vorontsov 2009-03-24 19:07 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).