aboutsummaryrefslogtreecommitdiff
path: root/arch/um/Kconfig_char
diff options
context:
space:
mode:
authorSteve French <sfrench@hera.kernel.org>2005-06-09 14:44:56 -0700
committerSteve French <sfrench@hera.kernel.org>2005-06-09 14:44:56 -0700
commitf5d9b97ee0d6d00a29bf881263510d74291fb862 (patch)
tree90b22e6038da0ad40e54c3f52e8da67189730ae8 /arch/um/Kconfig_char
parent3079ca621e9e09f4593c20a9a2f24237c355f683 (diff)
parentcf380ee7308db0f067ceb2ae8b852838788bf453 (diff)
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/Kconfig_char')
-rw-r--r--arch/um/Kconfig_char6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/um/Kconfig_char b/arch/um/Kconfig_char
index 3e50fdb6762..62d87b71179 100644
--- a/arch/um/Kconfig_char
+++ b/arch/um/Kconfig_char
@@ -204,5 +204,11 @@ config UML_RANDOM
http://sourceforge.net/projects/gkernel/). rngd periodically reads
/dev/hwrng and injects the entropy into /dev/random.
+config MMAPPER
+ tristate "iomem emulation driver"
+ help
+ This driver allows a host file to be used as emulated IO memory inside
+ UML.
+
endmenu