Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

[u-boot] / include / cpsw.h

diff --git a/include/cpsw.h b/include/cpsw.h
index 743cb96e7e9e1502dfb807b1f8d9110b42605c98..a73843d2f75cd6f7d4743fd8d05af19423cf3704 100644 (file)
--- a/include/cpsw.h
+++ b/include/cpsw.h
@@ -19,7 +19,7 @@
 struct cpsw_slave_data {
        u32             slave_reg_ofs;
        u32             sliver_reg_ofs;
-       int             phy_id;
+       int             phy_addr;
        int             phy_if;
 };