projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.denx.de/u-boot-x86
[platform/kernel/u-boot.git]
/
common
/
malloc_simple.c
diff --git
a/common/malloc_simple.c
b/common/malloc_simple.c
index
dd1119f
..
479a1e4
100644
(file)
--- a/
common/malloc_simple.c
+++ b/
common/malloc_simple.c
@@
-44,7
+44,7
@@
void *memalign_simple(size_t align, size_t bytes)
return ptr;
}
-#if
def CONFIG_SYS_MALLOC_SIMPLE
+#if
CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
void *calloc(size_t nmemb, size_t elem_size)
{
size_t size = nmemb * elem_size;