summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorArnaud Lacombe <lacombar@gmail.com>2010-09-04 16:05:15 -0400
committerArnaud Lacombe <lacombar@gmail.com>2010-09-19 22:53:57 -0400
commitba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46 (patch)
tree14580121ea391d72511e55db0d0392438b40410d /scripts/kconfig
parent0954828fcbf3bd13d593499b16b901a4e801b0b9 (diff)
downloadlinux-stable-ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46.tar.gz
linux-stable-ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46.tar.bz2
linux-stable-ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46.zip
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>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/menu.c2
1 files changed, 1 insertions, 1 deletions
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;
}