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

[platform/kernel/u-boot.git] / common / env_nowhere.c

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index b274c03..17ecc77 100644 (file)
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -31,7 +31,8 @@
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
-#include <malloc.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 env_t *env_ptr = NULL;
 
@@ -45,8 +46,6 @@ void env_relocate_spec (void)
 
 uchar env_get_char_spec (int index)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        return ( *((uchar *)(gd->env_addr + index)) );
 }
 
@@ -57,8 +56,6 @@ uchar env_get_char_spec (int index)
  */
 int  env_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->env_addr  = (ulong)&default_environment[0];
        gd->env_valid = 0;