[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, 10 insertions, 10 deletions

diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf
index c9d81cf5d7fb..b03220600b3a 100644
--- a/scripts/kconfig/zconf.gperf
+++ b/scripts/kconfig/zconf.gperf
@@ -25,17 +25,17 @@ endif,		T_ENDIF,	TF_COMMAND
 depends,        T_DEPENDS,      TF_COMMAND
 requires,       T_REQUIRES,     TF_COMMAND
 optional,       T_OPTIONAL,     TF_COMMAND
-default,        T_DEFAULT,      TF_COMMAND
+default,        T_DEFAULT,      TF_COMMAND, S_UNKNOWN
 prompt,         T_PROMPT,       TF_COMMAND
-tristate,       T_TRISTATE,     TF_COMMAND
-def_tristate,   T_DEF_TRISTATE, TF_COMMAND
-bool,           T_BOOLEAN,      TF_COMMAND
-boolean,        T_BOOLEAN,      TF_COMMAND
-def_bool,       T_DEF_BOOLEAN,  TF_COMMAND
-def_boolean,    T_DEF_BOOLEAN,  TF_COMMAND
-int,            T_INT,          TF_COMMAND
-hex,            T_HEX,          TF_COMMAND
-string,         T_STRING,       TF_COMMAND
+tristate,       T_TYPE,         TF_COMMAND, S_TRISTATE
+def_tristate,   T_DEFAULT,      TF_COMMAND, S_TRISTATE
+bool,           T_TYPE,         TF_COMMAND, S_BOOLEAN
+boolean,        T_TYPE,         TF_COMMAND, S_BOOLEAN
+def_bool,       T_DEFAULT,      TF_COMMAND, S_BOOLEAN
+def_boolean,    T_DEFAULT,      TF_COMMAND, S_BOOLEAN
+int,            T_TYPE,         TF_COMMAND, S_INT
+hex,            T_TYPE,         TF_COMMAND, S_HEX
+string,         T_TYPE,         TF_COMMAND, S_STRING
 select,         T_SELECT,       TF_COMMAND
 enable,         T_SELECT,       TF_COMMAND
 range,          T_RANGE,        TF_COMMAND