From: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat, 4 Sep 2010 20:05:15 +0000 (-0400)
Subject: kconfig: don't emit warning upon rootmenu's prompt redefinition
X-Git-Tag: firefly_0821_release~7613^2~3085^2~22^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46;p=firefly-linux-kernel-4.4.55.git

kconfig: don't emit warning upon rootmenu's prompt redefinition

This silences the warning printed upon prompt redefinition for the rootmenu.
We will encounter this redefinition when a "mainmenu" statement is specified and
override the default prompt.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Michal Marek <mmarek@suse.cz>
---

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 682045a7aae4..23acbdb2fd50 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;
 	}