diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-05 14:22:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-05 14:22:10 +0100 |
| commit | aef1b9cef78ae65c6501850851cc3f61f9be477b (patch) | |
| tree | 9769972983e84620df17c13b73f70a8341c4b125 /scripts | |
| parent | perf timechart: Adjust perf timechart to the new power events (diff) | |
| parent | Linux 2.6.37 (diff) | |
| download | linux-aef1b9cef78ae65c6501850851cc3f61f9be477b.tar.xz linux-aef1b9cef78ae65c6501850851cc3f61f9be477b.zip | |
Merge commit 'v2.6.37' into perf/core
Merge reason: Add the final .37 tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/menu.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index b9d9aa18e6d6..5f77dcb8977e 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -140,6 +140,20 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e } if (current_entry->prompt && current_entry != &rootmenu) prop_warn(prop, "prompt redefined"); + + /* Apply all upper menus' visibilities to actual prompts. */ + if(type == P_PROMPT) { + struct menu *menu = current_entry; + + while ((menu = menu->parent) != NULL) { + if (!menu->visibility) + continue; + prop->visible.expr + = expr_alloc_and(prop->visible.expr, + menu->visibility); + } + } + current_entry->prompt = prop; } prop->text = prompt; |