diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-01-08 14:33:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-08 14:33:53 +0000 |
| commit | a9f6941436e83d2f91caf06c13bee86cad309064 (patch) | |
| tree | 8f3b14ce3f98718cc2513344b82ceb703638ba9b /scripts/config/zconf.y | |
| parent | 3f26960a5c8db5b7cbdf120ddcd7feaadca51c8f (diff) | |
| download | upstream-a9f6941436e83d2f91caf06c13bee86cad309064.tar.gz upstream-a9f6941436e83d2f91caf06c13bee86cad309064.tar.bz2 upstream-a9f6941436e83d2f91caf06c13bee86cad309064.zip | |
scripts/config: sync with linux upstream
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43873
Diffstat (limited to 'scripts/config/zconf.y')
| -rw-r--r-- | scripts/config/zconf.y | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/scripts/config/zconf.y b/scripts/config/zconf.y index d9a9f62cb0..903803d7b0 100644 --- a/scripts/config/zconf.y +++ b/scripts/config/zconf.y @@ -503,9 +503,6 @@ void conf_parse(const char *name) sym_init(); _menu_init(); - modules_sym = sym_lookup(NULL, 0); - modules_sym->type = S_BOOLEAN; - modules_sym->flags |= SYMBOL_AUTO; rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); #if YYDEBUG @@ -515,12 +512,8 @@ void conf_parse(const char *name) zconfparse(); if (zconfnerrs) exit(1); - if (!modules_sym->prop) { - struct property *prop; - - prop = prop_alloc(P_DEFAULT, modules_sym); - prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); - } + if (!modules_sym) + modules_sym = sym_find( "n" ); rootmenu.prompt->text = _(rootmenu.prompt->text); rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); @@ -529,7 +522,7 @@ void conf_parse(const char *name) for_all_symbols(i, sym) { if (sym_check_deps(sym)) zconfnerrs++; - } + } if (zconfnerrs) exit(1); sym_set_change_count(1); |