kconfig: reference environment variables directly and remove 'option env='

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index c292f27d41d883a707b533bc9c7e5556e81cd8d2..c02e5c39f4ea162646f5524fcfb1284efe788ccc 100644 (file)
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -534,7 +534,6 @@ void conf_parse(const char *name)
 
        zconf_initscan(name);
 
-       sym_init();
        _menu_init();
        rootmenu.prompt = menu_add_prompt(P_MENU, "CARL9170 Firmware Configuration", NULL);
 
@@ -547,7 +546,7 @@ void conf_parse(const char *name)
                modules_sym = sym_find( "n" );
 
        tmp = rootmenu.prompt->text;
-       rootmenu.prompt->text = _(rootmenu.prompt->text);
+       rootmenu.prompt->text = rootmenu.prompt->text;
        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
        free((char*)tmp);
 
@@ -781,3 +780,4 @@ void zconfdump(FILE *out)
 #include "expr.c"
 #include "symbol.c"
 #include "menu.c"
+#include "preprocess.c"