ucc_geth: Fix merge error.

I left a merge failure unresolved, noticed by Stephen
Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 8f0ac442c9079d49827451a2e5a93a50cafa3867..5f866e276dd1d8935fd31b5168975e39ccf17e41 100644 (file)
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3641,14 +3641,9 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                if (err)
                        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);
                snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id),
                        "%s:%02x", bus_name, *prop);
->>>>>>> 61fa9dcf9329cb92c220f7b656410fbe5e72f933:drivers/net/ucc_geth.c
        }
 
        /* get the phy interface type, or default to MII */