[PATCH] kconfig: simplify symbol type parsing

This simplifies the parser a bit by merging the various symbol types into a
single token and adds the type to the keyword hash.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 0168141417f6..bedba89a87c6 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -1025,6 +1025,7 @@ YY_RULE_SETUP
                 struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
                 if (id && id->flags & TF_COMMAND) {
                         BEGIN(PARAM);
+                        zconflval.id = id;
                         return id->token;
                 }
                 alloc_string(zconftext, zconfleng);
@@ -1091,8 +1092,10 @@ case 19:
 YY_RULE_SETUP
 {
                 struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
-                if (id && id->flags & TF_PARAM)
+                if (id && id->flags & TF_PARAM) {
+                        zconflval.id = id;
                         return id->token;
+                }
                 alloc_string(zconftext, zconfleng);
                 zconflval.string = text;
                 return T_WORD;