kconfig: use parent->dep as the parentdep of 'menu'

[carl9170fw.git] / config / menu.c

diff --git a/config/menu.c b/config/menu.c
index d9d16469859ab9e008686007b93a78acb23cf6e9..bbabf0a59ac4e488052111c02f7e8bd29f29fc94 100644 (file)
--- a/config/menu.c
+++ b/config/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. */
@@ -326,12 +326,10 @@ void menu_finalize(struct menu *parent)
                         * choice value symbols.
                         */
                        parentdep = expr_alloc_symbol(sym);
-               } else if (parent->prompt)
-                       /* Menu node for 'menu' */
-                       parentdep = parent->prompt->visible.expr;
-               else
-                       /* Menu node for 'if' */
+               } else {
+                       /* Menu node for 'menu', 'if' */
                        parentdep = parent->dep;
+               }
 
                /* For each child menu node... */
                for (menu = parent->list; menu; menu = menu->next) {