Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / technologic / ts4800 / ts4800.c

diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index eef6922b20822d064eae6ad57e106fe2cd298268..e5bec57f4f21f1b8a0b4224fa98be09c30e4f2d3 100644 (file)
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -16,8 +16,9 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
 #include <mmc.h>
+#include <input.h>
 #include <fsl_esdhc.h>
 #include <mc13892.h>
 
@@ -178,7 +179,7 @@ static int fec_get_mac_from_register(uint32_t base_addr)
                ethaddr[i] = (reg_mac[i / 4] >> ((i % 4) * 8)) & 0xFF;
 
        if (is_valid_ethaddr(ethaddr)) {
-               eth_setenv_enetaddr("ethaddr", ethaddr);
+               eth_env_set_enetaddr("ethaddr", ethaddr);
                return 0;
        }