From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from buildserver.ru.mvista.com (unknown [213.79.90.228]) by ozlabs.org (Postfix) with ESMTP id AF370DDE28 for ; Wed, 25 Mar 2009 02:37:35 +1100 (EST) Date: Tue, 24 Mar 2009 18:37:34 +0300 From: Anton Vorontsov To: David Miller Subject: [PATCH] ucc_geth: Fix build breakage caused by a merge Message-ID: <20090324153734.GA8276@oksana.dev.rtsoft.ru> References: <382F4B5D-93C4-41BB-A00A-8A6C240CD170@kernel.crashing.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 In-Reply-To: <382F4B5D-93C4-41BB-A00A-8A6C240CD170@kernel.crashing.org> Cc: LinuxPPC Mailing List , Andy Fleming , Joakim Tjernlund , netdev@vger.kernel.org Reply-To: avorontsov@ru.mvista.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- 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