1 files changed, 96 insertions, 85 deletions
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped
index 345f0fc07ca3..47c8b5babf34 100644
--- a/scripts/kconfig/zconf.hash.c_shipped
+++ b/scripts/kconfig/zconf.hash.c_shipped
@@ -53,10 +53,10 @@ kconf_id_hash (register const char *str, register unsigned int len)
      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 25, 10, 15,
+      47, 47, 47, 47, 47, 47, 47, 25, 30, 15,
-       0,  0,  5, 47,  0,  0, 47, 47,  0, 10,
+       0, 15,  0, 47,  5, 15, 47, 47, 30, 20,
-       0, 20, 20, 20,  5,  0,  0, 20, 47, 47,
+       5,  0, 25, 15,  0,  0, 10, 35, 47, 47,
-      20, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+       5, 47, 47, 47, 47, 47, 47, 47, 47, 47,
      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
@@ -88,69 +88,75 @@ kconf_id_hash (register const char *str, register unsigned int len)
 struct kconf_id_strings_t
  {
-    char kconf_id_strings_str2[sizeof("if")];
+    char kconf_id_strings_str2[sizeof("on")];
-    char kconf_id_strings_str3[sizeof("int")];
+    char kconf_id_strings_str6[sizeof("string")];
-    char kconf_id_strings_str4[sizeof("help")];
+    char kconf_id_strings_str7[sizeof("default")];
-    char kconf_id_strings_str5[sizeof("endif")];
+    char kconf_id_strings_str8[sizeof("def_bool")];
-    char kconf_id_strings_str6[sizeof("select")];
-    char kconf_id_strings_str7[sizeof("endmenu")];
-    char kconf_id_strings_str8[sizeof("tristate")];
-    char kconf_id_strings_str9[sizeof("endchoice")];
    char kconf_id_strings_str10[sizeof("range")];
-    char kconf_id_strings_str11[sizeof("string")];
+    char kconf_id_strings_str11[sizeof("def_boolean")];
-    char kconf_id_strings_str12[sizeof("default")];
+    char kconf_id_strings_str12[sizeof("def_tristate")];
-    char kconf_id_strings_str13[sizeof("def_bool")];
+    char kconf_id_strings_str13[sizeof("hex")];
-    char kconf_id_strings_str14[sizeof("menu")];
+    char kconf_id_strings_str14[sizeof("defconfig_list")];
-    char kconf_id_strings_str16[sizeof("def_boolean")];
+    char kconf_id_strings_str16[sizeof("option")];
-    char kconf_id_strings_str17[sizeof("def_tristate")];
+    char kconf_id_strings_str17[sizeof("if")];
-    char kconf_id_strings_str18[sizeof("mainmenu")];
+    char kconf_id_strings_str18[sizeof("optional")];
-    char kconf_id_strings_str20[sizeof("menuconfig")];
+    char kconf_id_strings_str20[sizeof("endif")];
-    char kconf_id_strings_str21[sizeof("config")];
+    char kconf_id_strings_str21[sizeof("choice")];
-    char kconf_id_strings_str22[sizeof("on")];
+    char kconf_id_strings_str22[sizeof("endmenu")];
-    char kconf_id_strings_str23[sizeof("hex")];
+    char kconf_id_strings_str23[sizeof("requires")];
-    char kconf_id_strings_str26[sizeof("source")];
+    char kconf_id_strings_str24[sizeof("endchoice")];
-    char kconf_id_strings_str27[sizeof("depends")];
+    char kconf_id_strings_str26[sizeof("config")];
-    char kconf_id_strings_str28[sizeof("optional")];
+    char kconf_id_strings_str27[sizeof("modules")];
-    char kconf_id_strings_str31[sizeof("enable")];
+    char kconf_id_strings_str28[sizeof("int")];
-    char kconf_id_strings_str32[sizeof("comment")];
+    char kconf_id_strings_str29[sizeof("menu")];
-    char kconf_id_strings_str33[sizeof("requires")];
+    char kconf_id_strings_str31[sizeof("prompt")];
+    char kconf_id_strings_str32[sizeof("depends")];
+    char kconf_id_strings_str33[sizeof("tristate")];
    char kconf_id_strings_str34[sizeof("bool")];
+    char kconf_id_strings_str35[sizeof("menuconfig")];
+    char kconf_id_strings_str36[sizeof("select")];
    char kconf_id_strings_str37[sizeof("boolean")];
-    char kconf_id_strings_str41[sizeof("choice")];
+    char kconf_id_strings_str39[sizeof("help")];
-    char kconf_id_strings_str46[sizeof("prompt")];
+    char kconf_id_strings_str41[sizeof("source")];
+    char kconf_id_strings_str42[sizeof("comment")];
+    char kconf_id_strings_str43[sizeof("mainmenu")];
+    char kconf_id_strings_str46[sizeof("enable")];
  };
 static struct kconf_id_strings_t kconf_id_strings_contents =
  {
-    "if",
+    "on",
-    "int",
-    "help",
-    "endif",
-    "select",
-    "endmenu",
-    "tristate",
-    "endchoice",
-    "range",
    "string",
    "default",
    "def_bool",
-    "menu",
+    "range",
    "def_boolean",
    "def_tristate",
-    "mainmenu",
-    "menuconfig",
-    "config",
-    "on",
    "hex",
-    "source",
+    "defconfig_list",
-    "depends",
+    "option",
+    "if",
    "optional",
-    "enable",
+    "endif",
-    "comment",
+    "choice",
+    "endmenu",
    "requires",
+    "endchoice",
+    "config",
+    "modules",
+    "int",
+    "menu",
+    "prompt",
+    "depends",
+    "tristate",
    "bool",
+    "menuconfig",
+    "select",
    "boolean",
-    "choice",
+    "help",
-    "prompt"
+    "source",
+    "comment",
+    "mainmenu",
+    "enable"
  };
 #define kconf_id_strings ((const char *) &kconf_id_strings_contents)
 #ifdef __GNUC__
@@ -161,9 +167,9 @@ kconf_id_lookup (register const char *str, register unsigned int len)
 {
  enum
    {
-      TOTAL_KEYWORDS = 30,
+      TOTAL_KEYWORDS = 33,
      MIN_WORD_LENGTH = 2,
-      MAX_WORD_LENGTH = 12,
+      MAX_WORD_LENGTH = 14,
      MIN_HASH_VALUE = 2,
      MAX_HASH_VALUE = 46
    };
@@ -171,43 +177,48 @@ kconf_id_lookup (register const char *str, register unsigned int len)
  static struct kconf_id wordlist[] =
    {
      {-1}, {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,             T_IF,           TF_COMMAND|TF_PARAM},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,             T_ON,           TF_PARAM},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3,             T_TYPE,         TF_COMMAND, S_INT},
+      {-1}, {-1}, {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str4,             T_HELP,         TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,             T_TYPE,         TF_COMMAND, S_STRING},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,             T_ENDIF,        TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,     T_DEFAULT,      TF_COMMAND, S_UNKNOWN},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,             T_SELECT,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,     T_DEFAULT,      TF_COMMAND, S_BOOLEAN},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,     T_ENDMENU,      TF_COMMAND},
+      {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,     T_TYPE,         TF_COMMAND, S_TRISTATE},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,     T_ENDCHOICE,    TF_COMMAND},
      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,            T_RANGE,        TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,            T_TYPE,         TF_COMMAND, S_STRING},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,    T_DEFAULT,      TF_COMMAND, S_BOOLEAN},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,    T_DEFAULT,      TF_COMMAND, S_UNKNOWN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,    T_DEFAULT,      TF_COMMAND, S_TRISTATE},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,    T_DEFAULT,      TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,            T_TYPE,         TF_COMMAND, S_HEX},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,            T_MENU,         TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,    T_OPT_DEFCONFIG_LIST,TF_OPTION},
      {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,    T_DEFAULT,      TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,            T_OPTION,       TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,    T_DEFAULT,      TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,            T_IF,           TF_COMMAND|TF_PARAM},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,    T_MAINMENU,     TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,    T_OPTIONAL,     TF_COMMAND},
      {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20,    T_MENUCONFIG,   TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20,            T_ENDIF,        TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,            T_CONFIG,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,            T_CHOICE,       TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,            T_ON,           TF_PARAM},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,    T_ENDMENU,      TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,            T_TYPE,         TF_COMMAND, S_HEX},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,    T_REQUIRES,     TF_COMMAND},
-      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str24,    T_ENDCHOICE,    TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,            T_SOURCE,       TF_COMMAND},
+      {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,    T_DEPENDS,      TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,            T_CONFIG,       TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,    T_OPTIONAL,     TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,    T_OPT_MODULES,  TF_OPTION},
-      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,            T_TYPE,         TF_COMMAND, S_INT},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,            T_SELECT,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29,            T_MENU,         TF_COMMAND},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,    T_COMMENT,      TF_COMMAND},
+      {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,    T_REQUIRES,     TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,            T_PROMPT,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,    T_DEPENDS,      TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,    T_TYPE,         TF_COMMAND, S_TRISTATE},
      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str34,            T_TYPE,         TF_COMMAND, S_BOOLEAN},
-      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35,    T_MENUCONFIG,   TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36,            T_SELECT,       TF_COMMAND},
      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37,    T_TYPE,         TF_COMMAND, S_BOOLEAN},
-      {-1}, {-1}, {-1},
+      {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,            T_CHOICE,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39,            T_HELP,         TF_COMMAND},
-      {-1}, {-1}, {-1}, {-1},
+      {-1},
-      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,            T_PROMPT,       TF_COMMAND}
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,            T_SOURCE,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,    T_COMMENT,      TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43,    T_MAINMENU,     TF_COMMAND},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,            T_SELECT,       TF_COMMAND}
    };
  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped index 345f0fc07ca3..47c8b5babf34 100644 --- a/scripts/kconfig/zconf.hash.c_shipped +++ b/scripts/kconfig/zconf.hash.c_shipped
@@ -53,10 +53,10 @@ kconf_id_hash (register const char *str, register unsigned int len)
53	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,	53	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
54	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,	54	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
55	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,	55	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
56	47, 47, 47, 47, 47, 47, 47, 25, 10, 15,	56	47, 47, 47, 47, 47, 47, 47, 25, 30, 15,
57	0, 0, 5, 47, 0, 0, 47, 47, 0, 10,	57	0, 15, 0, 47, 5, 15, 47, 47, 30, 20,
58	0, 20, 20, 20, 5, 0, 0, 20, 47, 47,	58	5, 0, 25, 15, 0, 0, 10, 35, 47, 47,
59	20, 47, 47, 47, 47, 47, 47, 47, 47, 47,	59	5, 47, 47, 47, 47, 47, 47, 47, 47, 47,
60	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,	60	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
61	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,	61	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
62	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,	62	47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
@@ -88,69 +88,75 @@ kconf_id_hash (register const char *str, register unsigned int len)
88		88
89	struct kconf_id_strings_t	89	struct kconf_id_strings_t
90	{	90	{
91	char kconf_id_strings_str2[sizeof("if")];	91	char kconf_id_strings_str2[sizeof("on")];
92	char kconf_id_strings_str3[sizeof("int")];	92	char kconf_id_strings_str6[sizeof("string")];
93	char kconf_id_strings_str4[sizeof("help")];	93	char kconf_id_strings_str7[sizeof("default")];
94	char kconf_id_strings_str5[sizeof("endif")];	94	char kconf_id_strings_str8[sizeof("def_bool")];
95	char kconf_id_strings_str6[sizeof("select")];
96	char kconf_id_strings_str7[sizeof("endmenu")];
97	char kconf_id_strings_str8[sizeof("tristate")];
98	char kconf_id_strings_str9[sizeof("endchoice")];
99	char kconf_id_strings_str10[sizeof("range")];	95	char kconf_id_strings_str10[sizeof("range")];
100	char kconf_id_strings_str11[sizeof("string")];	96	char kconf_id_strings_str11[sizeof("def_boolean")];
101	char kconf_id_strings_str12[sizeof("default")];	97	char kconf_id_strings_str12[sizeof("def_tristate")];
102	char kconf_id_strings_str13[sizeof("def_bool")];	98	char kconf_id_strings_str13[sizeof("hex")];
103	char kconf_id_strings_str14[sizeof("menu")];	99	char kconf_id_strings_str14[sizeof("defconfig_list")];
104	char kconf_id_strings_str16[sizeof("def_boolean")];	100	char kconf_id_strings_str16[sizeof("option")];
105	char kconf_id_strings_str17[sizeof("def_tristate")];	101	char kconf_id_strings_str17[sizeof("if")];
106	char kconf_id_strings_str18[sizeof("mainmenu")];	102	char kconf_id_strings_str18[sizeof("optional")];
107	char kconf_id_strings_str20[sizeof("menuconfig")];	103	char kconf_id_strings_str20[sizeof("endif")];
108	char kconf_id_strings_str21[sizeof("config")];	104	char kconf_id_strings_str21[sizeof("choice")];
109	char kconf_id_strings_str22[sizeof("on")];	105	char kconf_id_strings_str22[sizeof("endmenu")];
110	char kconf_id_strings_str23[sizeof("hex")];	106	char kconf_id_strings_str23[sizeof("requires")];
111	char kconf_id_strings_str26[sizeof("source")];	107	char kconf_id_strings_str24[sizeof("endchoice")];
112	char kconf_id_strings_str27[sizeof("depends")];	108	char kconf_id_strings_str26[sizeof("config")];
113	char kconf_id_strings_str28[sizeof("optional")];	109	char kconf_id_strings_str27[sizeof("modules")];
114	char kconf_id_strings_str31[sizeof("enable")];	110	char kconf_id_strings_str28[sizeof("int")];
115	char kconf_id_strings_str32[sizeof("comment")];	111	char kconf_id_strings_str29[sizeof("menu")];
116	char kconf_id_strings_str33[sizeof("requires")];	112	char kconf_id_strings_str31[sizeof("prompt")];
		113	char kconf_id_strings_str32[sizeof("depends")];
		114	char kconf_id_strings_str33[sizeof("tristate")];
117	char kconf_id_strings_str34[sizeof("bool")];	115	char kconf_id_strings_str34[sizeof("bool")];
		116	char kconf_id_strings_str35[sizeof("menuconfig")];
		117	char kconf_id_strings_str36[sizeof("select")];
118	char kconf_id_strings_str37[sizeof("boolean")];	118	char kconf_id_strings_str37[sizeof("boolean")];
119	char kconf_id_strings_str41[sizeof("choice")];	119	char kconf_id_strings_str39[sizeof("help")];
120	char kconf_id_strings_str46[sizeof("prompt")];	120	char kconf_id_strings_str41[sizeof("source")];
		121	char kconf_id_strings_str42[sizeof("comment")];
		122	char kconf_id_strings_str43[sizeof("mainmenu")];
		123	char kconf_id_strings_str46[sizeof("enable")];
121	};	124	};
122	static struct kconf_id_strings_t kconf_id_strings_contents =	125	static struct kconf_id_strings_t kconf_id_strings_contents =
123	{	126	{
124	"if",	127	"on",
125	"int",
126	"help",
127	"endif",
128	"select",
129	"endmenu",
130	"tristate",
131	"endchoice",
132	"range",
133	"string",	128	"string",
134	"default",	129	"default",
135	"def_bool",	130	"def_bool",
136	"menu",	131	"range",
137	"def_boolean",	132	"def_boolean",
138	"def_tristate",	133	"def_tristate",
139	"mainmenu",
140	"menuconfig",
141	"config",
142	"on",
143	"hex",	134	"hex",
144	"source",	135	"defconfig_list",
145	"depends",	136	"option",
		137	"if",
146	"optional",	138	"optional",
147	"enable",	139	"endif",
148	"comment",	140	"choice",
		141	"endmenu",
149	"requires",	142	"requires",
		143	"endchoice",
		144	"config",
		145	"modules",
		146	"int",
		147	"menu",
		148	"prompt",
		149	"depends",
		150	"tristate",
150	"bool",	151	"bool",
		152	"menuconfig",
		153	"select",
151	"boolean",	154	"boolean",
152	"choice",	155	"help",
153	"prompt"	156	"source",
		157	"comment",
		158	"mainmenu",
		159	"enable"
154	};	160	};
155	#define kconf_id_strings ((const char *) &kconf_id_strings_contents)	161	#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
156	#ifdef __GNUC__	162	#ifdef __GNUC__
@@ -161,9 +167,9 @@ kconf_id_lookup (register const char *str, register unsigned int len)
161	{	167	{
162	enum	168	enum
163	{	169	{
164	TOTAL_KEYWORDS = 30,	170	TOTAL_KEYWORDS = 33,
165	MIN_WORD_LENGTH = 2,	171	MIN_WORD_LENGTH = 2,
166	MAX_WORD_LENGTH = 12,	172	MAX_WORD_LENGTH = 14,
167	MIN_HASH_VALUE = 2,	173	MIN_HASH_VALUE = 2,
168	MAX_HASH_VALUE = 46	174	MAX_HASH_VALUE = 46
169	};	175	};
@@ -171,43 +177,48 @@ kconf_id_lookup (register const char *str, register unsigned int len)
171	static struct kconf_id wordlist[] =	177	static struct kconf_id wordlist[] =
172	{	178	{
173	{-1}, {-1},	179	{-1}, {-1},
174	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2, T_IF, TF_COMMAND\|TF_PARAM},	180	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2, T_ON, TF_PARAM},
175	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3, T_TYPE, TF_COMMAND, S_INT},	181	{-1}, {-1}, {-1},
176	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str4, T_HELP, TF_COMMAND},	182	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6, T_TYPE, TF_COMMAND, S_STRING},
177	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5, T_ENDIF, TF_COMMAND},	183	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7, T_DEFAULT, TF_COMMAND, S_UNKNOWN},
178	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6, T_SELECT, TF_COMMAND},	184	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8, T_DEFAULT, TF_COMMAND, S_BOOLEAN},
179	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7, T_ENDMENU, TF_COMMAND},	185	{-1},
180	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8, T_TYPE, TF_COMMAND, S_TRISTATE},
181	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9, T_ENDCHOICE, TF_COMMAND},
182	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10, T_RANGE, TF_COMMAND},	186	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10, T_RANGE, TF_COMMAND},
183	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11, T_TYPE, TF_COMMAND, S_STRING},	187	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11, T_DEFAULT, TF_COMMAND, S_BOOLEAN},
184	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN},	188	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_TRISTATE},
185	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN},	189	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_TYPE, TF_COMMAND, S_HEX},
186	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_MENU, TF_COMMAND},	190	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_OPT_DEFCONFIG_LIST,TF_OPTION},
187	{-1},	191	{-1},
188	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_DEFAULT, TF_COMMAND, S_BOOLEAN},	192	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_OPTION, TF_COMMAND},
189	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE},	193	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_IF, TF_COMMAND\|TF_PARAM},
190	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_MAINMENU, TF_COMMAND},	194	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_OPTIONAL, TF_COMMAND},
191	{-1},	195	{-1},
192	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20, T_MENUCONFIG, TF_COMMAND},	196	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20, T_ENDIF, TF_COMMAND},
193	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_CONFIG, TF_COMMAND},	197	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_CHOICE, TF_COMMAND},
194	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_ON, TF_PARAM},	198	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_ENDMENU, TF_COMMAND},
195	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_TYPE, TF_COMMAND, S_HEX},	199	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_REQUIRES, TF_COMMAND},
196	{-1}, {-1},	200	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str24, T_ENDCHOICE, TF_COMMAND},
197	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26, T_SOURCE, TF_COMMAND},	201	{-1},
198	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_DEPENDS, TF_COMMAND},	202	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26, T_CONFIG, TF_COMMAND},
199	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28, T_OPTIONAL, TF_COMMAND},	203	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_OPT_MODULES, TF_OPTION},
200	{-1}, {-1},	204	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28, T_TYPE, TF_COMMAND, S_INT},
201	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SELECT, TF_COMMAND},	205	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29, T_MENU, TF_COMMAND},
202	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND},	206	{-1},
203	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_REQUIRES, TF_COMMAND},	207	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_PROMPT, TF_COMMAND},
		208	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_DEPENDS, TF_COMMAND},
		209	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_TYPE, TF_COMMAND, S_TRISTATE},
204	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str34, T_TYPE, TF_COMMAND, S_BOOLEAN},	210	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str34, T_TYPE, TF_COMMAND, S_BOOLEAN},
205	{-1}, {-1},	211	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND},
		212	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_SELECT, TF_COMMAND},
206	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_TYPE, TF_COMMAND, S_BOOLEAN},	213	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_TYPE, TF_COMMAND, S_BOOLEAN},
207	{-1}, {-1}, {-1},	214	{-1},
208	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_CHOICE, TF_COMMAND},	215	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39, T_HELP, TF_COMMAND},
209	{-1}, {-1}, {-1}, {-1},	216	{-1},
210	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_PROMPT, TF_COMMAND}	217	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_SOURCE, TF_COMMAND},
		218	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_COMMENT, TF_COMMAND},
		219	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43, T_MAINMENU, TF_COMMAND},
		220	{-1}, {-1},
		221	{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_SELECT, TF_COMMAND}
211	};	222	};
212		223
213	if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)	224	if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)