diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-08 22:12:42 -0700 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-06-09 07:31:30 +0200 |
| commit | 669bfad906522e74ee8d962801552a8c224c0d63 (patch) | |
| tree | 84b7e85d7d731b7f188c38d83139f9b6d4acaa56 /scripts/kconfig/conf.c | |
| parent | 0c1822e6991a10da6dc391f0a2e2cf5fb2e31238 (diff) | |
| download | linux-rpi3-669bfad906522e74ee8d962801552a8c224c0d63.tar.gz linux-rpi3-669bfad906522e74ee8d962801552a8c224c0d63.tar.bz2 linux-rpi3-669bfad906522e74ee8d962801552a8c224c0d63.zip | |
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>
Diffstat (limited to 'scripts/kconfig/conf.c')
| -rw-r--r-- | scripts/kconfig/conf.c | 6 |
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; |