diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-09 01:12:42 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-06-09 01:31:30 -0400 |
commit | 669bfad906522e74ee8d962801552a8c224c0d63 (patch) | |
tree | 84b7e85d7d731b7f188c38d83139f9b6d4acaa56 /scripts/kconfig/gconf.c | |
parent | 0c1822e6991a10da6dc391f0a2e2cf5fb2e31238 (diff) |
kconfig: allow loading multiple configurations
Extend conf_read_simple() so it can load multiple configurations.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/kconfig/gconf.c')
-rw-r--r-- | scripts/kconfig/gconf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 9cb3e6a47555..7b0d3a93d5c0 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -132,8 +132,6 @@ const char *dbg_print_flags(int val) | |||
132 | strcat(buf, "write/"); | 132 | strcat(buf, "write/"); |
133 | if (val & SYMBOL_CHANGED) | 133 | if (val & SYMBOL_CHANGED) |
134 | strcat(buf, "changed/"); | 134 | strcat(buf, "changed/"); |
135 | if (val & SYMBOL_NEW) | ||
136 | strcat(buf, "new/"); | ||
137 | if (val & SYMBOL_AUTO) | 135 | if (val & SYMBOL_AUTO) |
138 | strcat(buf, "auto/"); | 136 | strcat(buf, "auto/"); |
139 | 137 | ||
@@ -1186,9 +1184,7 @@ static gchar **fill_row(struct menu *menu) | |||
1186 | 1184 | ||
1187 | row[COL_OPTION] = | 1185 | row[COL_OPTION] = |
1188 | g_strdup_printf("%s %s", menu_get_prompt(menu), | 1186 | g_strdup_printf("%s %s", menu_get_prompt(menu), |
1189 | sym ? (sym-> | 1187 | sym && sym_has_value(sym) ? "(NEW)" : ""); |
1190 | flags & SYMBOL_NEW ? "(NEW)" : "") : | ||
1191 | ""); | ||
1192 | 1188 | ||
1193 | if (show_all && !menu_is_visible(menu)) | 1189 | if (show_all && !menu_is_visible(menu)) |
1194 | row[COL_COLOR] = g_strdup("DarkGray"); | 1190 | row[COL_COLOR] = g_strdup("DarkGray"); |