[ARM] mm: allow LH7A40x to use sparsemem

Enable Sparsemem support for LH7A40x SoCs, while still allowing the
existing discontig support for the time being.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ef218ea3010f..f5bf38b5f38d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -510,6 +510,8 @@ config ARCH_SHARK
 
 config ARCH_LH7A40X
         bool "Sharp LH7A40X"
+        select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
+        select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
         help
           Say Y here for systems based on one of the Sharp LH7A40X
           System on a Chip processors.  These CPUs include an ARM922T
@@ -842,12 +844,6 @@ config OABI_COMPAT
 # Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
         bool
-        default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
-        help
-          Say Y to support efficient handling of discontiguous physical memory,
-          for architectures which are either NUMA (Non-Uniform Memory Access)
-          or have huge holes in the physical address space for other reasons.
-          See <file:Documentation/vm/numa> for more.
 
 config ARCH_SPARSEMEM_ENABLE
         bool