diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 14:17:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 14:17:38 -0700 |
| commit | 605e9710fb5fef0dd2bb49d7b75e46601df62112 (patch) | |
| tree | bc37076381ebc9b003e4244f0630939861c8167c /scripts/kconfig/zconf.gperf | |
| parent | dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528 (diff) | |
| parent | 78a6854e219ba266b6cc12f840b571c5f1168b5e (diff) | |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kconfig updates from Michal Marek:
- kconfig warns about junk characters in Kconfig files
- merge_config.sh error handling
- small cleanup
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
merge_config.sh: exit on missing input files
kconfig: Regenerate shipped zconf.{hash,lex}.c files
kconfig: warn of unhandled characters in Kconfig commands
kconfig: Delete unnecessary checks before the function call "sym_calc_value"
Diffstat (limited to 'scripts/kconfig/zconf.gperf')
| -rw-r--r-- | scripts/kconfig/zconf.gperf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf index b6ac02d604f1..ac498f01b449 100644 --- a/scripts/kconfig/zconf.gperf +++ b/scripts/kconfig/zconf.gperf @@ -22,6 +22,7 @@ comment, T_COMMENT, TF_COMMAND config, T_CONFIG, TF_COMMAND menuconfig, T_MENUCONFIG, TF_COMMAND help, T_HELP, TF_COMMAND +---help---, T_HELP, TF_COMMAND if, T_IF, TF_COMMAND|TF_PARAM endif, T_ENDIF, TF_COMMAND depends, T_DEPENDS, TF_COMMAND |