Merge branch 'master' of git://github.com/chunkeey/carl9170fw

[carl9170fw.git] / config / menu.c

diff --git a/config/menu.c b/config/menu.c
index 7e233a6ca64ef7faf1bc9390ec89cb90ccef2d98..c1d53200c306dc6202cbcc13555a05333c34411a 100644 (file)
--- a/config/menu.c
+++ b/config/menu.c
@@ -197,12 +197,15 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)
 
 void menu_add_option(int token, char *arg)
 {
-       struct property *prop;
-
        switch (token) {
        case T_OPT_MODULES:
-               prop = prop_alloc(P_DEFAULT, modules_sym);
-               prop->expr = expr_alloc_symbol(current_entry->sym);
+               if (modules_sym)
+                       zconf_error("symbol '%s' redefines option 'modules'"
+                                   " already defined by symbol '%s'",
+                                   current_entry->sym->name,
+                                   modules_sym->name
+                                   );
+               modules_sym = current_entry->sym;
                break;
        case T_OPT_DEFCONFIG_LIST:
                if (!sym_defconfig_list)