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

[oweals/u-boot.git] / board / esd / du405 / du405.c

diff --git a/board/esd/du405/du405.c b/board/esd/du405/du405.c
index aa7ee92a5f13536300b04118ae6cd6a6583ad6ab..b1362a8694f23f1bf4896089aa28bd7ed67c5c3c 100644 (file)
--- a/board/esd/du405/du405.c
+++ b/board/esd/du405/du405.c
@@ -24,8 +24,8 @@
 #include <common.h>
 #include "du405.h"
 #include <asm/processor.h>
-#include <ppc4xx.h>
-#include <4xx_i2c.h>
+#include <asm/ppc4xx.h>
+#include <asm/ppc4xx-i2c.h>
 #include <command.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -163,7 +163,7 @@ int checkboard (void)
        int index;
        int len;
        char str[64];
-       int i = getenv_r ("serial#", str, sizeof (str));
+       int i = getenv_f("serial#", str, sizeof (str));
 
        puts ("Board: ");