---

yaml --- r: 135465 b: refs/heads/master c: 039a6f6 h: refs/heads/master i: 135463: 368704f v: v3
git-mirror · Mar 23, 2009 · 9da5829 · 9da5829
1 parent 5cf658e
commit 9da5829
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18f27383d9bdcb985cc39599e99917bdad101a60
+refs/heads/master: 039a6f6a39d2aa30ee53afdb213ea6dd4482928b
diff --git a/trunk/drivers/net/ucc_geth.c b/trunk/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 */