diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/zconf.gperf | 2 | ||||
-rw-r--r-- | scripts/kconfig/zconf.y | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf index 9b44c80dd899..93538e567bda 100644 --- a/scripts/kconfig/zconf.gperf +++ b/scripts/kconfig/zconf.gperf | |||
@@ -23,7 +23,6 @@ help, T_HELP, TF_COMMAND | |||
23 | if, T_IF, TF_COMMAND|TF_PARAM | 23 | if, T_IF, TF_COMMAND|TF_PARAM |
24 | endif, T_ENDIF, TF_COMMAND | 24 | endif, T_ENDIF, TF_COMMAND |
25 | depends, T_DEPENDS, TF_COMMAND | 25 | depends, T_DEPENDS, TF_COMMAND |
26 | requires, T_REQUIRES, TF_COMMAND | ||
27 | optional, T_OPTIONAL, TF_COMMAND | 26 | optional, T_OPTIONAL, TF_COMMAND |
28 | default, T_DEFAULT, TF_COMMAND, S_UNKNOWN | 27 | default, T_DEFAULT, TF_COMMAND, S_UNKNOWN |
29 | prompt, T_PROMPT, TF_COMMAND | 28 | prompt, T_PROMPT, TF_COMMAND |
@@ -32,7 +31,6 @@ def_tristate, T_DEFAULT, TF_COMMAND, S_TRISTATE | |||
32 | bool, T_TYPE, TF_COMMAND, S_BOOLEAN | 31 | bool, T_TYPE, TF_COMMAND, S_BOOLEAN |
33 | boolean, T_TYPE, TF_COMMAND, S_BOOLEAN | 32 | boolean, T_TYPE, TF_COMMAND, S_BOOLEAN |
34 | def_bool, T_DEFAULT, TF_COMMAND, S_BOOLEAN | 33 | def_bool, T_DEFAULT, TF_COMMAND, S_BOOLEAN |
35 | def_boolean, T_DEFAULT, TF_COMMAND, S_BOOLEAN | ||
36 | int, T_TYPE, TF_COMMAND, S_INT | 34 | int, T_TYPE, TF_COMMAND, S_INT |
37 | hex, T_TYPE, TF_COMMAND, S_HEX | 35 | hex, T_TYPE, TF_COMMAND, S_HEX |
38 | string, T_TYPE, TF_COMMAND, S_STRING | 36 | string, T_TYPE, TF_COMMAND, S_STRING |
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 79db4cf22a51..d9b96ba8e38c 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -64,7 +64,6 @@ static struct menu *current_menu, *current_entry; | |||
64 | %token <id>T_IF | 64 | %token <id>T_IF |
65 | %token <id>T_ENDIF | 65 | %token <id>T_ENDIF |
66 | %token <id>T_DEPENDS | 66 | %token <id>T_DEPENDS |
67 | %token <id>T_REQUIRES | ||
68 | %token <id>T_OPTIONAL | 67 | %token <id>T_OPTIONAL |
69 | %token <id>T_PROMPT | 68 | %token <id>T_PROMPT |
70 | %token <id>T_TYPE | 69 | %token <id>T_TYPE |
@@ -418,16 +417,6 @@ depends: T_DEPENDS T_ON expr T_EOL | |||
418 | { | 417 | { |
419 | menu_add_dep($3); | 418 | menu_add_dep($3); |
420 | printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); | 419 | printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); |
421 | } | ||
422 | | T_DEPENDS expr T_EOL | ||
423 | { | ||
424 | menu_add_dep($2); | ||
425 | printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno()); | ||
426 | } | ||
427 | | T_REQUIRES expr T_EOL | ||
428 | { | ||
429 | menu_add_dep($2); | ||
430 | printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno()); | ||
431 | }; | 420 | }; |
432 | 421 | ||
433 | /* prompt statement */ | 422 | /* prompt statement */ |