Merge tag 'powerpc-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

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

diff --git a/lib/Kconfig b/lib/Kconfig
index ac3b306..5c9c068 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -102,6 +102,20 @@ config INDIRECT_PIO
 
          When in doubt, say N.
 
+config INDIRECT_IOMEM
+       bool
+       help
+         This is selected by other options/architectures to provide the
+         emulated iomem accessors.
+
+config INDIRECT_IOMEM_FALLBACK
+       bool
+       depends on INDIRECT_IOMEM
+       help
+         If INDIRECT_IOMEM is selected, this enables falling back to plain
+         mmio accesses when the IO memory address is not a registered
+         emulated region.
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@ -669,9 +683,6 @@ config PARMAN
 config OBJAGG
        tristate "objagg" if COMPILE_TEST
 
-config STRING_SELFTEST
-       tristate "Test string functions"
-
 endmenu
 
 config GENERIC_IOREMAP