tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ucc_geth: Fix merge error.
I left a merge failure unresolved, noticed by Stephen
Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
-5
-5
drivers/net/ucc_geth.c
-5
drivers/net/ucc_geth.c
···
3641
3641
if (err)
3642
3642
return -1;
3643
3643
3644
-
<<<<<<< HEAD:drivers/net/ucc_geth.c
3645
-
snprintf(ug_info->mdio_bus, MII_BUS_ID_SIZE, "%x",
3646
-
res.start&0xfffff);
3647
-
=======
3648
3644
uec_mdio_bus_name(bus_name, mdio);
3649
3645
snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id),
3650
3646
"%s:%02x", bus_name, *prop);
3651
-
>>>>>>> 61fa9dcf9329cb92c220f7b656410fbe5e72f933:drivers/net/ucc_geth.c
3652
3647
}
3653
3648
3654
3649
/* get the phy interface type, or default to MII */