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/sh/mm/Kconfig | |
| 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/sh/mm/Kconfig')
| -rw-r--r-- | arch/sh/mm/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index c3e61b366493..cb8f9920f4dd 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
| @@ -143,9 +143,6 @@ config MAX_ACTIVE_REGIONS | |||
| 143 | CPU_SUBTYPE_SH7785) | 143 | CPU_SUBTYPE_SH7785) |
| 144 | default "1" | 144 | default "1" |
| 145 | 145 | ||
| 146 | config ARCH_POPULATES_NODE_MAP | ||
| 147 | def_bool y | ||
| 148 | |||
| 149 | config ARCH_SELECT_MEMORY_MODEL | 146 | config ARCH_SELECT_MEMORY_MODEL |
| 150 | def_bool y | 147 | def_bool y |
| 151 | 148 | ||