GCC-4.x fixes: clean up global data pointer initialization for all boards.

[karo-tx-uboot.git] / common / env_dataflash.c

diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index 8bfbbc943e138c968a6d79110690a605f18c2cbb..93fff29b05a4a6dda262fddbee115467495eae0a 100644 (file)
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -24,9 +24,10 @@
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
-#include <malloc.h>
 #include <dataflash.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 env_t *env_ptr = NULL;
 
 char * env_name_spec = "dataflash";
@@ -69,8 +70,6 @@ int i;
  */
 int env_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        ulong crc, len, new;
        unsigned off;
        uchar buf[64];