aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig6
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
839 UNPREDICTABLE (in fact it can be predicted that it won't work 839 UNPREDICTABLE (in fact it can be predicted that it won't work
840 at all). If in doubt say Y. 840 at all). If in doubt say Y.
841 841
842# Discontigmem is deprecated
842config ARCH_DISCONTIGMEM_ENABLE 843config ARCH_DISCONTIGMEM_ENABLE
843 bool 844 bool
844 default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) 845 default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
@@ -851,8 +852,11 @@ config ARCH_DISCONTIGMEM_ENABLE
851config ARCH_SPARSEMEM_ENABLE 852config ARCH_SPARSEMEM_ENABLE
852 bool 853 bool
853 854
855config ARCH_SPARSEMEM_DEFAULT
856 def_bool ARCH_SPARSEMEM_ENABLE
857
854config ARCH_SELECT_MEMORY_MODEL 858config ARCH_SELECT_MEMORY_MODEL
855 bool 859 def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE
856 860
857config NODES_SHIFT 861config NODES_SHIFT
858 int 862 int