diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-07-26 02:12:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 05:57:12 +0200 |
| commit | 7fa38e7e9ead2dc7a346db10dd27a40dd83b2a26 (patch) | |
| tree | a8d336621c2069f286b6ac761355e58f38812602 | |
| parent | um: add netpoll support (diff) | |
| download | linux-7fa38e7e9ead2dc7a346db10dd27a40dd83b2a26.tar.xz linux-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>
| -rw-r--r-- | arch/um/Kconfig.x86 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86 index 8aae429a56e2..d31ecf346b4e 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" |