4 files changed, 6 insertions, 14 deletions

diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 30e4f9d69c2f..87238afb21b7 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -145,7 +145,8 @@ static void __expr_eliminate_eq(enum expr_type type, struct expr **ep1, struct e
                 return;
         }
         if (e1->type == E_SYMBOL && e2->type == E_SYMBOL &&
-            e1->left.sym == e2->left.sym && (e1->left.sym->flags & (SYMBOL_YES|SYMBOL_NO)))
+            e1->left.sym == e2->left.sym &&
+            (e1->left.sym == &symbol_yes || e1->left.sym == &symbol_no))
                 return;
         if (!expr_eq(e1, e2))
                 return;
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 1b36ef18c48d..52ea4df8e349 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -78,10 +78,7 @@ struct symbol {
 
 #define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
 
-#define SYMBOL_YES              0x0001
-#define SYMBOL_MOD              0x0002
-#define SYMBOL_NO               0x0004
-#define SYMBOL_CONST            0x0007
+#define SYMBOL_CONST            0x0001
 #define SYMBOL_CHECK            0x0008
 #define SYMBOL_CHOICE           0x0010
 #define SYMBOL_CHOICEVAL        0x0020
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 665bd5300a19..9cb3e6a47555 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -114,12 +114,6 @@ const char *dbg_print_flags(int val)
 
         bzero(buf, 256);
 
-        if (val & SYMBOL_YES)
-                strcat(buf, "yes/");
-        if (val & SYMBOL_MOD)
-                strcat(buf, "mod/");
-        if (val & SYMBOL_NO)
-                strcat(buf, "no/");
         if (val & SYMBOL_CONST)
                 strcat(buf, "const/");
         if (val & SYMBOL_CHECK)
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 3d7877afccd5..a0a467a4387b 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -15,15 +15,15 @@
 struct symbol symbol_yes = {
         .name = "y",
         .curr = { "y", yes },
-        .flags = SYMBOL_YES|SYMBOL_VALID,
+        .flags = SYMBOL_CONST|SYMBOL_VALID,
 }, symbol_mod = {
         .name = "m",
         .curr = { "m", mod },
-        .flags = SYMBOL_MOD|SYMBOL_VALID,
+        .flags = SYMBOL_CONST|SYMBOL_VALID,
 }, symbol_no = {
         .name = "n",
         .curr = { "n", no },
-        .flags = SYMBOL_NO|SYMBOL_VALID,
+        .flags = SYMBOL_CONST|SYMBOL_VALID,
 }, symbol_empty = {
         .name = "",
         .curr = { "", no },