aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2019-12-17 13:14:16 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2020-01-07 02:18:44 +0900
commitf64048a20b0ce1bb1fd5c3f80e82556db73fe08b (patch)
treebc7a7cfc2d5550f0c4e23db42f44a196113cdb2d /scripts
parentLinux 5.5-rc5 (diff)
downloadlinux-dev-f64048a20b0ce1bb1fd5c3f80e82556db73fe08b.tar.xz
linux-dev-f64048a20b0ce1bb1fd5c3f80e82556db73fe08b.zip
kconfig: remove the rootmenu check in menu_add_prop()
This reverts commit ba6ff60d5eb4 ("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 0724a7c32a54 ("kconfig: Don't leak main menus during parsing"). Remove the unneeded check. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
-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 d9d16469859a..b1b1ee8cf987 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -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. */