Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f38d1008 authored by Andy Fleming's avatar Andy Fleming Committed by Jeff Garzik
Browse files

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: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 2db3e47e

drivers/net/ucc_geth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3926,7 +3926,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma 
	ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);

	ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);

	fixed_link = of_get_property(np, "fixed-link", NULL);

	fixed_link = of_get_property(np, "fixed-link", NULL);

	if (fixed_link) {

	if (fixed_link) {

		ug_info->mdio_bus = 0;

		snprintf(ug_info->mdio_bus, MII_BUS_ID_SIZE, "0");

		ug_info->phy_address = fixed_link[0];

		ug_info->phy_address = fixed_link[0];

		phy = NULL;

		phy = NULL;

	} else {

	} else {