Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6-omap-h63xx.git] / arch / um / Kconfig.x86

diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86
index 76200c9f454a29aaf84b736666db4466f01a6873..5ee328099c6359ae721f919ba554ba53e7052551 100644 (file)
--- a/arch/um/Kconfig.x86
+++ b/arch/um/Kconfig.x86
@@ -1,3 +1,7 @@
+source "arch/um/Kconfig.common"
+
+menu "UML-specific options"
+
 menu "Host processor type and features"
 
 source "arch/x86/Kconfig.cpu"
@@ -44,3 +48,9 @@ config SMP_BROKEN
 
 config GENERIC_HWEIGHT
        def_bool y
+
+source "arch/um/Kconfig.um"
+
+endmenu
+
+source "arch/um/Kconfig.rest"