Merge branch 'master' of git://git.denx.de/u-boot-arm

2014-03-10 14:22:54 -04:00
parent c0d297946f 27019e4a94
commit 5495dae7aa
61 changed files with 983 additions and 91 deletions
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -47,7 +47,7 @@ static void cpsw_control(int enabled)
 static struct cpsw_slave_data cpsw_slave = {
 	.slave_reg_ofs	= 0x208,
 	.sliver_reg_ofs	= 0xd80,
-	.phy_id		= 0,
+	.phy_addr	= 0,
 	.phy_if		= PHY_INTERFACE_MODE_RGMII,
 };