diff options
author | Tom Rini <trini@ti.com> | 2013-02-12 10:18:31 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-02-12 10:18:31 -0500 |
commit | 951c6baaf44c7fd4335b75fb92840d4e42c94927 (patch) | |
tree | 6a09cce20c4f3affb7b500d018eb84f848e42c20 /drivers/net/fec_mxc.h | |
parent | 58864ddc7276ca7403ddbb716da5853638f37519 (diff) | |
parent | fd8e1c3866578d87ed14a04a59faae341fd415df (diff) | |
download | talos-obmc-uboot-951c6baaf44c7fd4335b75fb92840d4e42c94927.tar.gz talos-obmc-uboot-951c6baaf44c7fd4335b75fb92840d4e42c94927.zip |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/net/fec_mxc.h')
-rw-r--r-- | drivers/net/fec_mxc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h index 203285af9a..b8f0da36cd 100644 --- a/drivers/net/fec_mxc.h +++ b/drivers/net/fec_mxc.h @@ -271,11 +271,11 @@ struct fec_priv { bd_t *bd; uint8_t *tdb_ptr; int dev_id; - int phy_id; struct mii_dev *bus; #ifdef CONFIG_PHYLIB struct phy_device *phydev; #else + int phy_id; int (*mii_postcall)(int); #endif }; |