Patchwork ucc_geth: Fix build breakage caused by a merge

login
register
mail settings
Submitter Anton Vorontsov
Date March 24, 2009, 3:37 p.m.
Message ID <20090324153734.GA8276@oksana.dev.rtsoft.ru>
Download mbox | patch
Permalink /patch/25019/
State Accepted
Delegated to: David Miller
Headers show

Comments

Anton Vorontsov - March 24, 2009, 3:37 p.m.
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(-)
David Miller - March 24, 2009, 7:07 p.m.
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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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);
 	}