Merge tag 'dt-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / arch / sh / mm / Kconfig

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 5a43a871e097a5aa1d66f952320e624c60024a38..dba285e86808c7da56070728c3617c61ba7acdc9 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -137,13 +137,6 @@ config ARCH_SPARSEMEM_ENABLE
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
 
-config MAX_ACTIVE_REGIONS
-       int
-       default "6" if (CPU_SUBTYPE_SHX3 && SPARSEMEM)
-       default "2" if SPARSEMEM && (CPU_SUBTYPE_SH7722 || \
-                      CPU_SUBTYPE_SH7785)
-       default "1"
-
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y