Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[pandora-kernel.git] / scripts / kconfig / expr.h

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 998cf4f..6084525 100644 (file)
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -65,6 +65,7 @@ enum symbol_type {
 
 enum {
        S_DEF_USER,             /* main user value */
+       S_DEF_AUTO,
 };
 
 struct symbol {
@@ -97,7 +98,7 @@ struct symbol {
 #define SYMBOL_WARNED          0x8000
 #define SYMBOL_DEF             0x10000
 #define SYMBOL_DEF_USER                0x10000
-#define SYMBOL_DEF2            0x20000
+#define SYMBOL_DEF_AUTO                0x20000
 #define SYMBOL_DEF3            0x40000
 #define SYMBOL_DEF4            0x80000
 
@@ -155,6 +156,7 @@ struct file *lookup_file(const char *name);
 
 extern struct symbol symbol_yes, symbol_no, symbol_mod;
 extern struct symbol *modules_sym;
+extern struct symbol *sym_defconfig_list;
 extern int cdebug;
 struct expr *expr_alloc_symbol(struct symbol *sym);
 struct expr *expr_alloc_one(enum expr_type type, struct expr *ce);