diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2015-11-12 05:27:24 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-12 05:27:24 (GMT) |
| commit | e40f4ee0112e6c9b0a16fb12ebd7bbcabc9b844a (patch) | |
| tree | 7197d3389bee18dccc349f09a8c69711aad29a06 /kconfig/confdata.c | |
| parent | 265503461b24eba2c946d6e70c760e530eaba170 (diff) | |
kconfig: Add updates from linux-4.3 and 4.4
Add updates from the following merges:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/scripts/kconfig?id=605e9710fb5fef0dd2bb49d7b75e46601df62112
and
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/scripts/kconfig?id=152813e6e4bbb5f017e33eba7eb01bbda4b389b8
that apply to crosstool-ng.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'kconfig/confdata.c')
| -rw-r--r-- | kconfig/confdata.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kconfig/confdata.c b/kconfig/confdata.c index c814f57..0b7dc2f 100644 --- a/kconfig/confdata.c +++ b/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; } |