parisc: Switch from DISCONTIGMEM to SPARSEMEM

[linux.git] / arch / parisc / Kconfig

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index c8038165b81fd203d2fe219a643bc5a462fa3444..26c215570adfb8ee8a6ab98b65012337eb554b1b 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -36,6 +36,7 @@ config PARISC
        select GENERIC_STRNCPY_FROM_USER
        select SYSCTL_ARCH_UNALIGN_ALLOW
        select SYSCTL_EXCEPTION_TRACE
+       select ARCH_DISCARD_MEMBLOCK
        select HAVE_MOD_ARCH_SPECIFIC
        select VIRT_TO_BUS
        select MODULES_USE_ELF_RELA
@@ -314,21 +315,16 @@ config ARCH_SELECT_MEMORY_MODEL
        def_bool y
        depends on 64BIT
 
-config ARCH_DISCONTIGMEM_ENABLE
+config ARCH_SPARSEMEM_ENABLE
        def_bool y
        depends on 64BIT
 
 config ARCH_FLATMEM_ENABLE
        def_bool y
 
-config ARCH_DISCONTIGMEM_DEFAULT
+config ARCH_SPARSEMEM_DEFAULT
        def_bool y
-       depends on ARCH_DISCONTIGMEM_ENABLE
-
-config NODES_SHIFT
-       int
-       default "3"
-       depends on NEED_MULTIPLE_NODES
+       depends on ARCH_SPARSEMEM_ENABLE
 
 source "kernel/Kconfig.hz"