Merge ../linus

[linux-2.6-omap-h63xx.git] / scripts / kconfig / zconf.gperf

diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf
index b03220600b3a1031cf3965720f96ee88ece398d2..9b44c80dd8994308884fa138b6ce249cff5603fc 100644 (file)
--- a/scripts/kconfig/zconf.gperf
+++ b/scripts/kconfig/zconf.gperf
@@ -39,5 +39,8 @@ 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
 %%