aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2008-04-23 17:56:17 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-25 02:07:09 -0400
commitf38d1008b034e39397d3da67919e220c851db75e (patch)
treefa41a70b14e94cd0dda45851aa15a8472f4776ba /drivers
parent2db3e47e7080fde2a43d6312190d8229826b8e42 (diff)
ucc_geth: Fix sneaky merge conflict regarding bus_id
The patch that changed mdio_bus to a string didn't conflict strongly enough with the patch that added fixed PHY support to UCC. Gather it back into the fold. Fixes this error: ... CC drivers/net/ucc_geth.o 'ucc_geth_probe': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/net/ucc_geth.c:3935: error: incompatible types in assignment make[3]: *** [drivers/net/ucc_geth.o] Error 1 Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ucc_geth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 29a4d650e8a8..0aac91c3e4e4 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3926,7 +3926,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
3926 ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); 3926 ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
3927 fixed_link = of_get_property(np, "fixed-link", NULL); 3927 fixed_link = of_get_property(np, "fixed-link", NULL);
3928 if (fixed_link) { 3928 if (fixed_link) {
3929 ug_info->mdio_bus = 0; 3929 snprintf(ug_info->mdio_bus, MII_BUS_ID_SIZE, "0");
3930 ug_info->phy_address = fixed_link[0]; 3930 ug_info->phy_address = fixed_link[0];
3931 phy = NULL; 3931 phy = NULL;
3932 } else { 3932 } else {