From patchwork Sat Jun 18 21:34:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 894162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5ILYtgZ024761 for ; Sat, 18 Jun 2011 21:34:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752891Ab1FRVec (ORCPT ); Sat, 18 Jun 2011 17:34:32 -0400 Received: from georges.telenet-ops.be ([195.130.137.68]:55916 "EHLO georges.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752741Ab1FRVeb (ORCPT ); Sat, 18 Jun 2011 17:34:31 -0400 Received: from ayla.of.borg ([84.193.80.148]) by georges.telenet-ops.be with bizsmtp id xZaV1g00H3C005g06ZaVmA; Sat, 18 Jun 2011 23:34:30 +0200 Received: from geert by ayla.of.borg with local (Exim 4.71) (envelope-from ) id 1QY39x-0002XT-EA; Sat, 18 Jun 2011 23:34:29 +0200 From: Geert Uytterhoeven To: Jeff Dike , Richard Weinberger , Arnaud Lacombe Cc: user-mode-linux-devel@lists.sourceforge.net, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] um: Reinstate kernel version in generated .config Date: Sat, 18 Jun 2011 23:34:25 +0200 Message-Id: <1308432865-9730-1-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.0.4 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sat, 18 Jun 2011 21:34:55 +0000 (UTC) commit 0954828fcbf3bd13d593499b16b901a4e801b0b9 ("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 --- 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 8aae429..d31ecf3 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"