summaryrefslogtreecommitdiff
path: root/common/dlmalloc.c
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-06-08 22:04:22 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-06-08 22:04:22 -0700
commite44f3ea4e801d37ef293284cb57b9637382f211a (patch)
tree09e6e9e68764e65ef7115db18319ec7e57c90b41 /common/dlmalloc.c
parent0e38c938ed4bcadb4f4fc1419a541431e94fc202 (diff)
parent8155efbd7ae9c65564ca98affe94631d612ae088 (diff)
downloadolio-uboot-2014.01-e44f3ea4e801d37ef293284cb57b9637382f211a.tar.xz
olio-uboot-2014.01-e44f3ea4e801d37ef293284cb57b9637382f211a.zip
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'common/dlmalloc.c')
-rw-r--r--common/dlmalloc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 20c206913..c51351e96 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,3 +1,5 @@
+#include <common.h>
+
#if 0 /* Moved to malloc.h */
/* ---------- To make a malloc.h, start cutting here ------------ */
@@ -947,7 +949,6 @@ void malloc_stats();
#endif /* 0 */
#endif /* 0 */ /* Moved to malloc.h */
-#include <common.h>
DECLARE_GLOBAL_DATA_PTR;