diff options
author | Wolfgang Denk <wd@denx.de> | 2011-02-02 21:57:19 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-02-02 21:57:19 +0100 |
commit | be9db564de898240034151c48cf9e0d03ece3f35 (patch) | |
tree | f87b02a573c61fdab3f190de09e6b0c8061f446b /drivers/net/fec_mxc.c | |
parent | 89ffa8dbb5bd0552f5f3399f4430a4c97f4d50d4 (diff) | |
parent | 9e40808c3fe0237a8d49f10394d3a8e4e29540a6 (diff) | |
download | u-boot-imx-be9db564de898240034151c48cf9e0d03ece3f35.zip u-boot-imx-be9db564de898240034151c48cf9e0d03ece3f35.tar.gz u-boot-imx-be9db564de898240034151c48cf9e0d03ece3f35.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'drivers/net/fec_mxc.c')
-rw-r--r-- | drivers/net/fec_mxc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index c438962..4e4cd27 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -354,7 +354,7 @@ static int fec_open(struct eth_device *edev) */ writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_ETHER_EN, &fec->eth->ecntrl); -#ifdef CONFIG_MX25 +#if defined(CONFIG_MX25) || defined(CONFIG_MX53) udelay(100); /* * setup the MII gasket for RMII mode |