diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:12:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:12:07 -0400 |
| commit | e4d6152b520184be87aa65cb7035bf87acd27c14 (patch) | |
| tree | 4395b636552a5d475b7e64f0522d77ae01eba0da /scripts/kconfig/expr.c | |
| parent | da9e82b3b8989fc09e2a4c45b9da604ba2b4c46d (diff) | |
| parent | 7a996d3ab150bb0e1b71fa182f70199a703efdd1 (diff) | |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (26 commits)
kconfig: add savedefconfig
kconfig: code refactoring in confdata.c
kconfig: refactor code in symbol.c
kconfig: add alldefconfig
kconfig: print more info when we see a recursive dependency
kconfig: save location of config symbols
kconfig: change nonint_oldconfig to listnewconfig
kconfig: rename loose_nonint_oldconfig => oldnoconfig
kconfig: use long options in conf
kconfig: fix MODULES-related bug in case of no .config
kconfig: make randconfig fair for booleans
kconfig: Don't write invisible choice values
kbuild: Warn on selecting symbols with unmet direct dependencies
scripts:conf.c Fix warning: variable 'type' set but not used
menuconfig: truncate list items
menuconfig: fix to center checklist correctly in a corner case
xconfig: add support to show hidden options which have prompts
xconfig: remove unused function
xconfig: clean up
gconfig: fix null pointer warning
...
Diffstat (limited to 'scripts/kconfig/expr.c')
| -rw-r--r-- | scripts/kconfig/expr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index d83f2322893a..8f18e37892cb 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c | |||
| @@ -1121,7 +1121,7 @@ static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *s | |||
| 1121 | } | 1121 | } |
| 1122 | 1122 | ||
| 1123 | str_append(gs, str); | 1123 | str_append(gs, str); |
| 1124 | if (sym) | 1124 | if (sym && sym->type != S_UNKNOWN) |
| 1125 | str_printf(gs, " [=%s]", sym_str); | 1125 | str_printf(gs, " [=%s]", sym_str); |
| 1126 | } | 1126 | } |
| 1127 | 1127 | ||
