Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash

[u-boot] / cpu / arm926ejs / davinci / ether.c

diff --git a/cpu/arm926ejs/davinci/ether.c b/cpu/arm926ejs/davinci/ether.c
index 9ec1ee70bf70cbed559d884d54472659a829c5b2..766bc7d66c57442e481c38a341e8d2db093220be 100644 (file)
--- 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);