summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-07-25 17:12:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 20:57:12 -0700
commit7fa38e7e9ead2dc7a346db10dd27a40dd83b2a26 (patch)
treea8d336621c2069f286b6ac761355e58f38812602 /arch/um
parentdd71dc4c335a8957d269ce063b3e80933f3482fc (diff)
downloadlinux-3.10-7fa38e7e9ead2dc7a346db10dd27a40dd83b2a26.tar.gz
linux-3.10-7fa38e7e9ead2dc7a346db10dd27a40dd83b2a26.tar.bz2
linux-3.10-7fa38e7e9ead2dc7a346db10dd27a40dd83b2a26.zip
um: reinstate kernel version in generated .config
Commit 0954828fcbf3 ("kconfig: replace KERNELVERSION usage by the mainmenu's prompt") made the kernel version disappear from the generated .config file when configuring for UML. As UML's Kconfig doesn't have a mainmenu, kconfig falls back to the default string "Linux Kernel Configuration". Add a suitable mainmenu to the main UML Kconfig file to fix this. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Kconfig.x862
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86
index 8aae429a56e..d31ecf346b4 100644
--- a/arch/um/Kconfig.x86
+++ b/arch/um/Kconfig.x86
@@ -1,3 +1,5 @@
+mainmenu "User Mode Linux/$SUBARCH $KERNELVERSION Kernel Configuration"
+
source "arch/um/Kconfig.common"
menu "UML-specific options"