Merge tag 'dmaengine-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index d0808a2..3636da2 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -9,7 +9,6 @@ config SELECT_MEMORY_MODEL
 choice
        prompt "Memory model"
        depends on SELECT_MEMORY_MODEL
-       default DISCONTIGMEM_MANUAL if ARCH_DISCONTIGMEM_DEFAULT
        default SPARSEMEM_MANUAL if ARCH_SPARSEMEM_DEFAULT
        default FLATMEM_MANUAL
        help
@@ -871,4 +870,7 @@ config MAPPING_DIRTY_HELPERS
 config KMAP_LOCAL
        bool
 
+# struct io_mapping based helper.  Selected by drivers that need them
+config IO_MAPPING
+       bool
 endmenu