kconfig: syntax cleanup - drop support for "depends/requires/def_boolean"

[pandora-kernel.git] / scripts / kconfig / zconf.gperf

diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf
index c9d81cf..93538e5 100644 (file)
--- a/scripts/kconfig/zconf.gperf
+++ b/scripts/kconfig/zconf.gperf
@@ -23,21 +23,22 @@ help,               T_HELP,         TF_COMMAND
 if,            T_IF,           TF_COMMAND|TF_PARAM
 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
+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
+option,                T_OPTION,       TF_COMMAND
 on,            T_ON,           TF_PARAM
+modules,       T_OPT_MODULES,  TF_OPTION
+defconfig_list,        T_OPT_DEFCONFIG_LIST,TF_OPTION
 %%