diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 06:14:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 06:14:26 -0500 |
| commit | 45aa0663cc408617b79a2b53f0a5f50e94688a48 (patch) | |
| tree | 0a53931c317c3c72a3555bd2fbb70a881ee870f2 /arch/arm/kernel/setup.c | |
| parent | 511585a28e5b5fd1cac61e601e42efc4c5dd64b5 (diff) | |
| parent | 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 (diff) | |
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/setup.c')
| -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 @@ | |||
| 52 | #include <asm/mach/time.h> | 52 | #include <asm/mach/time.h> |
| 53 | #include <asm/traps.h> | 53 | #include <asm/traps.h> |
| 54 | #include <asm/unwind.h> | 54 | #include <asm/unwind.h> |
| 55 | #include <asm/memblock.h> | ||
| 55 | 56 | ||
| 56 | #if defined(CONFIG_DEPRECATED_PARAM_STRUCT) | 57 | #if defined(CONFIG_DEPRECATED_PARAM_STRUCT) |
| 57 | #include "compat.h" | 58 | #include "compat.h" |