summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-04-04 14:20:32 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-04-04 14:20:32 +0200
commit8f2c6a3d2b513e64f680e7e9a70d1e068b71110a (patch)
tree2cd7facc579bfe2c268567a35e8322f178b692dc /common
parent4856aee6a85e50ce73a9d8a2b827766454faf033 (diff)
parenta17aee8d86956f0e6071489f37d45a8f264dabdb (diff)
downloadbarebox-8f2c6a3d2b513e64f680e7e9a70d1e068b71110a.tar.gz
barebox-8f2c6a3d2b513e64f680e7e9a70d1e068b71110a.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
-rw-r--r--common/tlsf_malloc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/common/tlsf_malloc.c b/common/tlsf_malloc.c
index 5c5bb61575..cd01b567b9 100644
--- a/common/tlsf_malloc.c
+++ b/common/tlsf_malloc.c
@@ -17,10 +17,8 @@
*
*/
-#include <config.h>
#include <malloc.h>
#include <string.h>
-#include <malloc.h>
#include <stdio.h>
#include <module.h>