X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=cpu%2Farm926ejs%2Fdavinci%2Fether.c;h=766bc7d66c57442e481c38a341e8d2db093220be;hb=926662762e5d280f6a9caed8dd9f49be2ebcaf2f;hp=9ec1ee70bf70cbed559d884d54472659a829c5b2;hpb=59530af55613a8c5fac3c4e0f5fbcf2f1611c483;p=u-boot diff --git a/cpu/arm926ejs/davinci/ether.c b/cpu/arm926ejs/davinci/ether.c index 9ec1ee70bf..766bc7d66c 100644 --- a/cpu/arm926ejs/davinci/ether.c +++ b/cpu/arm926ejs/davinci/ether.c @@ -252,7 +252,6 @@ static int gen_auto_negotiate(int phy_addr) { u_int16_t tmp; - if (!dm644x_eth_phy_read(phy_addr, PHY_BMCR, &tmp)) return(0); @@ -273,8 +272,7 @@ static int gen_auto_negotiate(int phy_addr) /* End of generic PHY functions */ - -#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) +#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) static int dm644x_mii_phy_read(char *devname, unsigned char addr, unsigned char reg, unsigned short *value) { return(dm644x_eth_phy_read(addr, reg, value) ? 0 : 1);