linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / scripts / kconfig / lkc.h

diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 2628023..527f60c 100644 (file)
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -40,10 +40,6 @@ extern "C" {
 
 #define TF_COMMAND     0x0001
 #define TF_PARAM       0x0002
-#define TF_OPTION      0x0004
-
-#define T_OPT_MODULES          1
-#define T_OPT_DEFCONFIG_LIST   2
 
 struct kconf_id {
        int name;
@@ -64,6 +60,8 @@ int zconf_lineno(void);
 char *zconf_curname(void);
 
 /* confdata.c */
+extern const char conf_def_filename[];
+
 char *conf_get_default_confname(void);
 
 /* kconfig_load.c */
@@ -80,7 +78,6 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
 struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
 void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
-void menu_add_option(int token, char *arg);
 void menu_finalize(struct menu *parent);
 void menu_set_type(int type);
 
@@ -102,7 +99,6 @@ const char *str_get(struct gstr *gs);
 /* symbol.c */
 void sym_init(void);
 void sym_clear_all_valid(void);
-void sym_set_all_changed(void);
 void sym_set_changed(struct symbol *sym);
 struct symbol *sym_check_deps(struct symbol *sym);
 struct property *prop_alloc(enum prop_type type, struct symbol *sym);
@@ -141,7 +137,7 @@ static inline bool sym_is_optional(struct symbol *sym)
 
 static inline bool sym_has_value(struct symbol *sym)
 {
-       return sym->flags & SYMBOL_DEF_USER ? true : false;
+       return sym->flags & SYMBOL_NEW ? false : true;
 }
 
 #ifdef __cplusplus