diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:56 +0200 |
| commit | 8a11a59b379b641423a6ed655aae36ec00404403 (patch) | |
| tree | a10f059d0bdcf9ba043cef744d605f9260991b18 /common/memory.c | |
| parent | e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39 (diff) | |
| parent | 9183a8c683014f7f6dae004009556c9c0d4d2a15 (diff) | |
| download | barebox-8a11a59b379b641423a6ed655aae36ec00404403.tar.gz barebox-8a11a59b379b641423a6ed655aae36ec00404403.tar.xz | |
Merge branch 'for-next/efi'
Conflicts:
.gitignore
Makefile
drivers/serial/Makefile
Diffstat (limited to 'common/memory.c')
| -rw-r--r-- | common/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/memory.c b/common/memory.c index 7dbd7f4399..4a8fe283f2 100644 --- a/common/memory.c +++ b/common/memory.c @@ -58,7 +58,7 @@ void mem_malloc_init(void *start, void *end) #endif } -#ifndef __SANDBOX__ +#if !defined __SANDBOX__ && !defined CONFIG_ARCH_EFI static int mem_malloc_resource(void) { /* |