diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 10:59:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 10:59:36 +0100 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /scripts/kconfig/lex.zconf.c_shipped | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
| download | kernel-crypto-4010b0192ddf6ec7ec1b9feb9b0953692aeb7329.tar.gz kernel-crypto-4010b0192ddf6ec7ec1b9feb9b0953692aeb7329.tar.xz kernel-crypto-4010b0192ddf6ec7ec1b9feb9b0953692aeb7329.zip | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'scripts/kconfig/lex.zconf.c_shipped')
| -rw-r--r-- | scripts/kconfig/lex.zconf.c_shipped | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index 7342ce0a778..dc3e81807d1 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped @@ -2370,11 +2370,14 @@ void zconf_nextfile(const char *name) current_buf = buf; if (file->flags & FILE_BUSY) { - printf("recursive scan (%s)?\n", name); + printf("%s:%d: do not source '%s' from itself\n", + zconf_curname(), zconf_lineno(), name); exit(1); } if (file->flags & FILE_SCANNED) { - printf("file %s already scanned?\n", name); + printf("%s:%d: file '%s' is already sourced from '%s'\n", + zconf_curname(), zconf_lineno(), name, + file->parent->name); exit(1); } file->flags |= FILE_BUSY; |