diff options
| author | Arnaud Lacombe <lacombar@gmail.com> | 2010-09-04 22:05:15 +0200 |
|---|---|---|
| committer | Arnaud Lacombe <lacombar@gmail.com> | 2010-09-20 04:53:57 +0200 |
| commit | ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46 (patch) | |
| tree | 14580121ea391d72511e55db0d0392438b40410d | |
| parent | kconfig: replace KERNELVERSION usage by the mainmenu's prompt (diff) | |
| download | linux-ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46.tar.xz linux-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>
| -rw-r--r-- | scripts/kconfig/menu.c | 2 |
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; } |