diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-09 00:17:38 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-09 00:17:38 +0300 |
| commit | 605e9710fb5fef0dd2bb49d7b75e46601df62112 (patch) | |
| tree | bc37076381ebc9b003e4244f0630939861c8167c /scripts/kconfig/confdata.c | |
| parent | dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528 (diff) | |
| parent | 78a6854e219ba266b6cc12f840b571c5f1168b5e (diff) | |
| download | linux-605e9710fb5fef0dd2bb49d7b75e46601df62112.tar.xz | |
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/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index c814f57672fc..0b7dc2fd7bac 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -268,8 +268,7 @@ int conf_read_simple(const char *name, int def) goto load; sym_add_change_count(1); if (!sym_defconfig_list) { - if (modules_sym) - sym_calc_value(modules_sym); + sym_calc_value(modules_sym); return 1; } @@ -404,9 +403,7 @@ setsym: } free(line); fclose(in); - - if (modules_sym) - sym_calc_value(modules_sym); + sym_calc_value(modules_sym); return 0; } |