Merge git://www.denx.de/git/u-boot-imx

[u-boot] / board / renesas / alt / alt.c

diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 3501a170442c2c2ef2ee3356cd44399fdf21463c..0bf8160f1fa2bcb8725de9e3a651ff2c42a694b8 100644 (file)
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -13,7 +13,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
@@ -143,7 +143,7 @@ int board_eth_init(bd_t *bis)
        unsigned char enetaddr[6];
 
        ret = sh_eth_initialize(bis);
-       if (!eth_getenv_enetaddr("ethaddr", enetaddr))
+       if (!eth_env_get_enetaddr("ethaddr", enetaddr))
                return ret;
 
        /* Set Mac address */
@@ -217,7 +217,7 @@ int dram_init(void)
 }
 
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 void reset_cpu(ulong addr)