Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block

[mv-sheeva.git] / arch / um / Kconfig.um

diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um
index b5e675e370c67203ef301ee0c0766d2babd5a330..70fd690964e4ef0e71b21817dcffc1827ce402dd 100644 (file)
--- a/arch/um/Kconfig.um
+++ b/arch/um/Kconfig.um
@@ -148,5 +148,11 @@ config KERNEL_STACK_ORDER
          be 1 << order pages.  The default is OK unless you're running Valgrind
          on UML, in which case, set this to 3.
 
+config MMAPPER
+       tristate "iomem emulation driver"
+       help
+         This driver allows a host file to be used as emulated IO memory inside
+         UML.
+
 config NO_DMA
        def_bool y