diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /scripts/basic/fixdep.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'scripts/basic/fixdep.c')
| -rw-r--r-- | scripts/basic/fixdep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 291228e25984..cb1f50cf12e3 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
| @@ -345,6 +345,7 @@ static void parse_dep_file(void *map, size_t len) | |||
| 345 | memcpy(s, m, p-m); s[p-m] = 0; | 345 | memcpy(s, m, p-m); s[p-m] = 0; |
| 346 | if (strrcmp(s, "include/generated/autoconf.h") && | 346 | if (strrcmp(s, "include/generated/autoconf.h") && |
| 347 | strrcmp(s, "arch/um/include/uml-config.h") && | 347 | strrcmp(s, "arch/um/include/uml-config.h") && |
| 348 | strrcmp(s, "include/linux/kconfig.h") && | ||
| 348 | strrcmp(s, ".ver")) { | 349 | strrcmp(s, ".ver")) { |
| 349 | /* | 350 | /* |
| 350 | * Do not list the source file as dependency, so that | 351 | * Do not list the source file as dependency, so that |