kconfig: allow loading multiple configurations

Extend conf_read_simple() so it can load multiple configurations.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 9334da65f364..ded5ffe184b8 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -573,7 +573,7 @@ int main(int ac, char **av)
         case set_random:
                 name = getenv("KCONFIG_ALLCONFIG");
                 if (name && !stat(name, &tmpstat)) {
-                        conf_read_simple(name);
+                        conf_read_simple(name, S_DEF_USER);
                         break;
                 }
                 switch (input_mode) {
@@ -584,9 +584,9 @@ int main(int ac, char **av)
                 default: break;
                 }
                 if (!stat(name, &tmpstat))
-                        conf_read_simple(name);
+                        conf_read_simple(name, S_DEF_USER);
                 else if (!stat("all.config", &tmpstat))
-                        conf_read_simple("all.config");
+                        conf_read_simple("all.config", S_DEF_USER);
                 break;
         default:
                 break;