projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
env
/
ext4.c
diff --git
a/env/ext4.c
b/env/ext4.c
index 9947381bfdb5858ef393252304f6d1c429d9674e..1f6b1b5bd818ba674b8f828aa7c8af92e4b432c3 100644
(file)
--- a/
env/ext4.c
+++ b/
env/ext4.c
@@
-21,7
+21,8
@@
#include <common.h>
#include <command.h>
#include <common.h>
#include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
#include <linux/stddef.h>
#include <malloc.h>
#include <memalign.h>
#include <linux/stddef.h>
#include <malloc.h>
#include <memalign.h>
@@
-127,7
+128,7
@@
static int env_ext4_load(void)
return env_import(buf, 1);
err_env_relocate:
return env_import(buf, 1);
err_env_relocate:
-
set_default_env
(NULL, 0);
+
env_set_default
(NULL, 0);
return -EIO;
}
return -EIO;
}