diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-01 21:39:58 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-01 21:41:32 +0100 |
commit | 07a2f737ba1d73ace591dd03c512bb0dd63f6785 (patch) | |
tree | 76ef1e09ee3016263c910337fd400028a7a5150b | |
parent | ee93916efe22f767628f9d25abb8ad8548797336 (diff) | |
download | talos-obmc-linux-07a2f737ba1d73ace591dd03c512bb0dd63f6785.tar.gz talos-obmc-linux-07a2f737ba1d73ace591dd03c512bb0dd63f6785.zip |
[ARM] mm: deprecate discontigmem on ARM
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b21c93a5f926..ef218ea3010f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -839,6 +839,7 @@ config OABI_COMPAT UNPREDICTABLE (in fact it can be predicted that it won't work at all). If in doubt say Y. +# Discontigmem is deprecated config ARCH_DISCONTIGMEM_ENABLE bool default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) @@ -851,8 +852,11 @@ config ARCH_DISCONTIGMEM_ENABLE config ARCH_SPARSEMEM_ENABLE bool +config ARCH_SPARSEMEM_DEFAULT + def_bool ARCH_SPARSEMEM_ENABLE + config ARCH_SELECT_MEMORY_MODEL - bool + def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE config NODES_SHIFT int |