diff options
| author | Ingo Molnar | 2011-12-20 12:14:26 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2011-12-20 12:14:26 +0100 |
| commit | 45aa0663cc408617b79a2b53f0a5f50e94688a48 (patch) | |
| tree | 0a53931c317c3c72a3555bd2fbb70a881ee870f2 /arch/arm/kernel | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| parent | memblock: Reimplement memblock allocation using reverse free area iterator (diff) | |
| download | kernel-qcow2-linux-45aa0663cc408617b79a2b53f0a5f50e94688a48.tar.gz kernel-qcow2-linux-45aa0663cc408617b79a2b53f0a5f50e94688a48.tar.xz kernel-qcow2-linux-45aa0663cc408617b79a2b53f0a5f50e94688a48.zip | |
Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 8fc2c8fcbdc6..c0b59bff6be6 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -52,6 +52,7 @@ #include <asm/mach/time.h> #include <asm/traps.h> #include <asm/unwind.h> +#include <asm/memblock.h> #if defined(CONFIG_DEPRECATED_PARAM_STRUCT) #include "compat.h" |