tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

kconfig: remove "enable"

Kconfig had a synonym "enable" for "select" that was neither documented
nor used.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

authored by

Adrian Bunk and committed by
Sam Ravnborg 9649ef87 58fb0d4f

+18 -21
-1
scripts/kconfig/zconf.gperf
··· 35 35 hex, T_TYPE, TF_COMMAND, S_HEX 36 36 string, T_TYPE, TF_COMMAND, S_STRING 37 37 select, T_SELECT, TF_COMMAND 38 - enable, T_SELECT, TF_COMMAND 39 38 range, T_RANGE, TF_COMMAND 40 39 option, T_OPTION, TF_COMMAND 41 40 on, T_ON, TF_PARAM
+18 -20
scripts/kconfig/zconf.hash.c_shipped
··· 1 - /* ANSI-C code produced by gperf version 3.0.2 */ 1 + /* ANSI-C code produced by gperf version 3.0.3 */ 2 2 /* Command-line: gperf */ 3 3 /* Computed positions: -k'1,3' */ 4 4 ··· 53 53 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 54 54 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 55 55 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 56 - 49, 49, 49, 49, 49, 49, 49, 35, 35, 5, 56 + 49, 49, 49, 49, 49, 49, 49, 49, 11, 5, 57 57 0, 0, 5, 49, 5, 20, 49, 49, 5, 20, 58 58 5, 0, 30, 49, 0, 15, 0, 10, 0, 49, 59 - 10, 49, 49, 49, 49, 49, 49, 49, 49, 49, 59 + 25, 49, 49, 49, 49, 49, 49, 49, 49, 49, 60 60 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 61 61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 62 62 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, ··· 100 100 char kconf_id_strings_str12[sizeof("default")]; 101 101 char kconf_id_strings_str13[sizeof("def_bool")]; 102 102 char kconf_id_strings_str14[sizeof("help")]; 103 + char kconf_id_strings_str15[sizeof("bool")]; 103 104 char kconf_id_strings_str16[sizeof("config")]; 104 105 char kconf_id_strings_str17[sizeof("def_tristate")]; 105 - char kconf_id_strings_str18[sizeof("hex")]; 106 + char kconf_id_strings_str18[sizeof("boolean")]; 106 107 char kconf_id_strings_str19[sizeof("defconfig_list")]; 107 108 char kconf_id_strings_str21[sizeof("string")]; 108 109 char kconf_id_strings_str22[sizeof("if")]; ··· 114 113 char kconf_id_strings_str29[sizeof("menu")]; 115 114 char kconf_id_strings_str31[sizeof("source")]; 116 115 char kconf_id_strings_str32[sizeof("comment")]; 116 + char kconf_id_strings_str33[sizeof("hex")]; 117 117 char kconf_id_strings_str35[sizeof("menuconfig")]; 118 118 char kconf_id_strings_str36[sizeof("prompt")]; 119 119 char kconf_id_strings_str37[sizeof("depends")]; 120 - char kconf_id_strings_str39[sizeof("bool")]; 121 - char kconf_id_strings_str41[sizeof("enable")]; 122 - char kconf_id_strings_str42[sizeof("boolean")]; 123 120 char kconf_id_strings_str48[sizeof("mainmenu")]; 124 121 }; 125 122 static struct kconf_id_strings_t kconf_id_strings_contents = ··· 134 135 "default", 135 136 "def_bool", 136 137 "help", 138 + "bool", 137 139 "config", 138 140 "def_tristate", 139 - "hex", 141 + "boolean", 140 142 "defconfig_list", 141 143 "string", 142 144 "if", ··· 148 148 "menu", 149 149 "source", 150 150 "comment", 151 + "hex", 151 152 "menuconfig", 152 153 "prompt", 153 154 "depends", 154 - "bool", 155 - "enable", 156 - "boolean", 157 155 "mainmenu" 158 156 }; 159 157 #define kconf_id_strings ((const char *) &kconf_id_strings_contents) 160 158 #ifdef __GNUC__ 161 159 __inline 160 + #ifdef __GNUC_STDC_INLINE__ 161 + __attribute__ ((__gnu_inline__)) 162 + #endif 162 163 #endif 163 164 struct kconf_id * 164 165 kconf_id_lookup (register const char *str, register unsigned int len) 165 166 { 166 167 enum 167 168 { 168 - TOTAL_KEYWORDS = 32, 169 + TOTAL_KEYWORDS = 31, 169 170 MIN_WORD_LENGTH = 2, 170 171 MAX_WORD_LENGTH = 14, 171 172 MIN_HASH_VALUE = 2, ··· 189 188 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN}, 190 189 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN}, 191 190 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_HELP, TF_COMMAND}, 192 - {-1}, 191 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str15, T_TYPE, TF_COMMAND, S_BOOLEAN}, 193 192 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_CONFIG, TF_COMMAND}, 194 193 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE}, 195 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_HEX}, 194 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_BOOLEAN}, 196 195 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19, T_OPT_DEFCONFIG_LIST,TF_OPTION}, 197 196 {-1}, 198 197 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_TYPE, TF_COMMAND, S_STRING}, ··· 206 205 {-1}, 207 206 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SOURCE, TF_COMMAND}, 208 207 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND}, 209 - {-1}, {-1}, 208 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_TYPE, TF_COMMAND, S_HEX}, 209 + {-1}, 210 210 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND}, 211 211 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_PROMPT, TF_COMMAND}, 212 212 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_DEPENDS, TF_COMMAND}, 213 + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, 213 214 {-1}, 214 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39, T_TYPE, TF_COMMAND, S_BOOLEAN}, 215 - {-1}, 216 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_SELECT, TF_COMMAND}, 217 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_TYPE, TF_COMMAND, S_BOOLEAN}, 218 - {-1}, {-1}, {-1}, {-1}, {-1}, 219 215 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48, T_MAINMENU, TF_COMMAND} 220 216 }; 221 217