Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[mv-sheeva.git] / scripts / kconfig / conf.c

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index d190092c3b6ebf00d09a68fa4e5cb606afacd364..3baaaecd6b13ef3ba684f8e5320cfef10f1f5a4e 100644 (file)
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -498,14 +498,15 @@ int main(int ac, char **av)
        conf_parse(name);
        //zconfdump(stdout);
        if (sync_kconfig) {
-               if (stat(".config", &tmpstat)) {
+               name = conf_get_configname();
+               if (stat(name, &tmpstat)) {
                        fprintf(stderr, _("***\n"
                                "*** You have not yet configured your kernel!\n"
-                               "*** (missing kernel .config file)\n"
+                               "*** (missing kernel config file \"%s\")\n"
                                "***\n"
                                "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
                                "*** \"make menuconfig\" or \"make xconfig\").\n"
-                               "***\n"));
+                               "***\n"), name);
                        exit(1);
                }
        }