Merge remote-tracking branch 'u-boot-samsung/master'

[karo-tx-uboot.git] / board / keymile / common / common.c

diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 3d7b05661a56d99cfe8e95cba3d866316b213304..2ddb3da38f35f7245551bd66ebbffabd71f59420 100644 (file)
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -12,7 +12,7 @@
 #include <ioports.h>
 #include <command.h>
 #include <malloc.h>
-#include <hush.h>
+#include <cli_hush.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/io.h>
@@ -142,6 +142,7 @@ void i2c_init_board(void)
 }
 #endif
 
+#if defined(CONFIG_KM_COMMON_ETH_INIT)
 int board_eth_init(bd_t *bis)
 {
        if (ethernet_present())
@@ -149,6 +150,7 @@ int board_eth_init(bd_t *bis)
 
        return -1;
 }
+#endif
 
 /*
  * do_setboardid command