Commit 039a6f6a authored by David S. Miller's avatar David S. Miller

ucc_geth: Fix merge error.

I left a merge failure unresolved, noticed by Stephen
Rothwell.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18f27383
...@@ -3641,14 +3641,9 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma ...@@ -3641,14 +3641,9 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
if (err) if (err)
return -1; return -1;
<<<<<<< HEAD:drivers/net/ucc_geth.c
snprintf(ug_info->mdio_bus, MII_BUS_ID_SIZE, "%x",
res.start&0xfffff);
=======
uec_mdio_bus_name(bus_name, mdio); uec_mdio_bus_name(bus_name, mdio);
snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id), snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id),
"%s:%02x", bus_name, *prop); "%s:%02x", bus_name, *prop);
>>>>>>> 61fa9dcf9329cb92c220f7b656410fbe5e72f933:drivers/net/ucc_geth.c
} }
/* get the phy interface type, or default to MII */ /* get the phy interface type, or default to MII */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment