diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-05 16:41:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-05 16:41:13 -0800 |
| commit | 31c67c755363c7e7821221e72f8594ab8995764d (patch) | |
| tree | a55fea1c515e4738b426af02da02598371ac8bb8 /scripts/kconfig/zconf.gperf | |
| parent | 47ad504c56235c7c7c0020e631651420a55c74e7 (diff) | |
| parent | 307991055b0ce65d53dc1eb501c456c10eb36360 (diff) | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
initramfs: Really fix build break on symbol-prefixed archs
[media] Fix Kconfig errors due to two visible menus
i2c/algos: convert Kconfig to use the menu's `visible' keyword
media/video: convert Kconfig to use the menu's `visible' keyword
Revert "i2c: Fix Kconfig dependencies"
kconfig: regen parser
kconfig: add an option to determine a menu's visibility
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 d8bc7424962..c9e690eb754 100644 --- a/scripts/kconfig/zconf.gperf +++ b/scripts/kconfig/zconf.gperf @@ -38,6 +38,7 @@ hex, T_TYPE, TF_COMMAND, S_HEX string, T_TYPE, TF_COMMAND, S_STRING select, T_SELECT, TF_COMMAND range, T_RANGE, TF_COMMAND +visible, T_VISIBLE, TF_COMMAND option, T_OPTION, TF_COMMAND on, T_ON, TF_PARAM modules, T_OPT_MODULES, TF_OPTION |