diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /scripts/kconfig/zconf.gperf | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 d8bc74249622..c9e690eb7545 100644 --- a/scripts/kconfig/zconf.gperf +++ b/scripts/kconfig/zconf.gperf | |||
| @@ -38,6 +38,7 @@ hex, T_TYPE, TF_COMMAND, S_HEX | |||
| 38 | string, T_TYPE, TF_COMMAND, S_STRING | 38 | string, T_TYPE, TF_COMMAND, S_STRING |
| 39 | select, T_SELECT, TF_COMMAND | 39 | select, T_SELECT, TF_COMMAND |
| 40 | range, T_RANGE, TF_COMMAND | 40 | range, T_RANGE, TF_COMMAND |
| 41 | visible, T_VISIBLE, TF_COMMAND | ||
| 41 | option, T_OPTION, TF_COMMAND | 42 | option, T_OPTION, TF_COMMAND |
| 42 | on, T_ON, TF_PARAM | 43 | on, T_ON, TF_PARAM |
| 43 | modules, T_OPT_MODULES, TF_OPTION | 44 | modules, T_OPT_MODULES, TF_OPTION |