aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-23 16:21:16 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-23 16:21:16 -0700
commit039a6f6a39d2aa30ee53afdb213ea6dd4482928b (patch)
tree7ea0979b9a227039be3b9ced35b9a429a6974cab /drivers/net
parent18f27383d9bdcb985cc39599e99917bdad101a60 (diff)
ucc_geth: Fix merge error.
I left a merge failure unresolved, noticed by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ucc_geth.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 8f0ac442c90..5f866e276dd 100644
--- 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 */