summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-07-29 14:57:27 +0000
committerMichal Marek <mmarek@suse.cz>2010-07-29 14:57:27 +0000
commitae7a3d8c5c6b9faa26789ab9f4fa99e2e3a38c73 (patch)
tree0c61e3eac6491c65c4f07541e1b43c4bd9f36f50 /scripts
parent8a6a091162ca4c588f1f83a6afa0654ffefc86a0 (diff)
parentac1ffde1ba053db0266f886a15ed845a6628fcb0 (diff)
Merge branch 'kconfig' into for-next
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/confdata.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 210a49e27d47..8dce5862550d 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -170,8 +170,11 @@ int conf_read_simple(const char *name, int def)
if (in)
goto load;
sym_add_change_count(1);
- if (!sym_defconfig_list)
+ if (!sym_defconfig_list) {
+ if (modules_sym)
+ sym_calc_value(modules_sym);
return 1;
+ }
for_all_defaults(sym_defconfig_list, prop) {
if (expr_calc_value(prop->visible.expr) == no ||