Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master

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

diff --git a/cpu/arm926ejs/davinci/ether.c b/cpu/arm926ejs/davinci/ether.c
index 32e81d11d4e0ed11d82d9c1fbc8b5480ff8fa8e9..766bc7d66c57442e481c38a341e8d2db093220be 100644 (file)
--- a/cpu/arm926ejs/davinci/ether.c
+++ b/cpu/arm926ejs/davinci/ether.c
@@ -272,7 +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);