linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Anton Vorontsov <avorontsov@ru.mvista.com>
To: David Miller <davem@davemloft.net>
Cc: LinuxPPC Mailing List <linuxppc-dev@ozlabs.org>,
	Andy Fleming <afleming@freescale.com>,
	Joakim Tjernlund <Joakim.Tjernlund@transmode.se>,
	netdev@vger.kernel.org
Subject: [PATCH] ucc_geth: Fix build breakage caused by a merge
Date: Tue, 24 Mar 2009 18:37:34 +0300	[thread overview]
Message-ID: <20090324153734.GA8276@oksana.dev.rtsoft.ru> (raw)
In-Reply-To: <382F4B5D-93C4-41BB-A00A-8A6C240CD170@kernel.crashing.org>

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

  reply	other threads:[~2009-03-24 15:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2009-03-24 19:07   ` [PATCH] ucc_geth: Fix build breakage caused by a merge David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090324153734.GA8276@oksana.dev.rtsoft.ru \
    --to=avorontsov@ru.mvista.com \
    --cc=Joakim.Tjernlund@transmode.se \
    --cc=afleming@freescale.com \
    --cc=davem@davemloft.net \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).