aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/Kconfig
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-23 17:00:34 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-23 01:55:22 -0400
commit4198426af37e7122f2fda2538fa9dcaa19c5e397 (patch)
tree398a9f0b31f3ad4c3a5dae5e39a5b238f3ecf224 /arch/um/Kconfig
parentf5ad6a42b700d9687bb97cf461e7f2506e3006d6 (diff)
x86, um: merge Kconfig.i386 and Kconfig.x86_64
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/Kconfig')
-rw-r--r--arch/um/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 393bccfe1785..a0801fda0be4 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -85,6 +85,10 @@ config STATIC_LINK
85 Additionally, this option enables using higher memory spaces (up to 85 Additionally, this option enables using higher memory spaces (up to
86 2.75G) for UML. 86 2.75G) for UML.
87 87
88config SUBARCH
89 string
90 option env="SUBARCH"
91
88source "arch/um/Kconfig.arch" 92source "arch/um/Kconfig.arch"
89source "mm/Kconfig" 93source "mm/Kconfig"
90source "kernel/time/Kconfig" 94source "kernel/time/Kconfig"