Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11...

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

diff --git a/arch/metag/mm/Kconfig b/arch/metag/mm/Kconfig
index 975f2f4e3ecf55f17521a3605c883bfd434fe554..03fb8f1555a1a5778a04b817ce57c2fa2ad47647 100644 (file)
--- a/arch/metag/mm/Kconfig
+++ b/arch/metag/mm/Kconfig
@@ -93,14 +93,6 @@ config ARCH_SPARSEMEM_ENABLE
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
 
-config MAX_ACTIVE_REGIONS
-       int
-       default "2" if SPARSEMEM
-       default "1"
-
-config ARCH_POPULATES_NODE_MAP
-       def_bool y
-
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y