Skip to content

Commit

Permalink
kconfig: remove the rootmenu check in menu_add_prop()
Browse files Browse the repository at this point in the history
This reverts commit ba6ff60 ("kconfig: don't emit warning upon
rootmenu's prompt redefinition").

At that time, rootmenu.prompt was always set first, then it was set
again if a "mainmenu" statement was specified in the Kconfig file.

This is no longer the case since commit 0724a7c ("kconfig: Don't
leak main menus during parsing"). Remove the unneeded check.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
  • Loading branch information
Masahiro Yamada committed Jan 6, 2020
1 parent c79f46a commit f64048a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/kconfig/menu.c
Original file line number Diff line number Diff line change
@@ -138,7 +138,7 @@ static struct property *menu_add_prop(enum prop_type type, char *prompt, struct
while (isspace(*prompt))
prompt++;
}
if (current_entry->prompt && current_entry != &rootmenu)
if (current_entry->prompt)
prop_warn(prop, "prompt redefined");

/* Apply all upper menus' visibilities to actual prompts. */

0 comments on commit f64048a

Please sign in to comment.