From patchwork Sat Sep 11 15:51:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 172102 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8BFrsFs029069 for ; Sat, 11 Sep 2010 15:54:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753101Ab0IKPyI (ORCPT ); Sat, 11 Sep 2010 11:54:08 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:48531 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752394Ab0IKPyI (ORCPT ); Sat, 11 Sep 2010 11:54:08 -0400 Received: by mail-gy0-f174.google.com with SMTP id 8so1615205gyd.19 for ; Sat, 11 Sep 2010 08:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=7i9SXD8SNLlD0NWwhryba70Y5SdxOdoTJgUgKkcP9Ws=; b=Ms6GcgiIZJEZ2IiDPxy3CXA2FaxBcxWGMtKKgrJjbg9ZRPzear2NnG9RTMAG//r8R5 HmQSW2XXgrY8NNq8CDdC4RMcImwpvXzSgTXnN7ukX1V7f9sojK/wl3rPUHSoOmXcDh4V 4Ycm7fRtLzXUlL9NI0uMQuCO9XBEm1gtgr1Xc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=kX2KLU8JoTtMJeRU1wzuBPKZl0X2NxMGnnnB1D/DyDG6+pqW3wNCMNuBn2Ri6UsqyW RD4HsCJIErY3gvwnvC4KS+/lG/qtnwFy+Ss4UdMpegsHAQtPVxo754Kyn32SME2NAqW0 8MJ6KbqM1yYI39spFY/55gW0yr8H0GOkYA2qE= Received: by 10.150.57.2 with SMTP id f2mr1023813yba.247.1284220447881; Sat, 11 Sep 2010 08:54:07 -0700 (PDT) Received: from localhost.localdomain (69-165-136-93.dsl.teksavvy.com [69.165.136.93]) by mx.google.com with ESMTPS id m12sm4025812ybn.19.2010.09.11.08.54.06 (version=SSLv3 cipher=RC4-MD5); Sat, 11 Sep 2010 08:54:07 -0700 (PDT) From: Arnaud Lacombe To: Sam Ravnborg , Michal Marek Cc: linux-kbuild , Arnaud Lacombe Subject: [PATCH 10/15] kconfig: don't emit warning upon rootmenu's prompt redefinition Date: Sat, 11 Sep 2010 11:51:17 -0400 Message-Id: <1284220282-3500-11-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.2.30.gc37d7.dirty In-Reply-To: <1284220282-3500-1-git-send-email-lacombar@gmail.com> References: <1284220282-3500-1-git-send-email-lacombar@gmail.com> 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.3 (demeter1.kernel.org [140.211.167.41]); Sat, 11 Sep 2010 15:54:09 +0000 (UTC) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 64da30c..d629ffd 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -139,7 +139,7 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e while (isspace(*prompt)) prompt++; } - if (current_entry->prompt) + if (current_entry->prompt && current_entry != &rootmenu) prop_warn(prop, "prompt redefined"); current_entry->prompt = prop; }