diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:24:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:24:28 -0700 |
| commit | d8f4b819c3a5b54a978c6fe5249a17cff490c4a1 (patch) | |
| tree | ce7f03f733de2b52e101a41e9b87256d106fe1d5 /scripts | |
| parent | 115a326c1e5cab457924356123bbfd7d783ecf9d (diff) | |
| parent | f072181e6403b0fe2e2aa800a005497b748fd284 (diff) | |
| download | linux-3.10-d8f4b819c3a5b54a978c6fe5249a17cff490c4a1.tar.gz linux-3.10-d8f4b819c3a5b54a978c6fe5249a17cff490c4a1.tar.bz2 linux-3.10-d8f4b819c3a5b54a978c6fe5249a17cff490c4a1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kconfig: drop the ""trying to assign nonexistent symbol" warning
kconfig: always write out .config
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/conf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/confdata.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 9fba838c706..36b5eedcdc7 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -596,7 +596,7 @@ int main(int ac, char **av) break; } - if (conf_get_changed() && conf_write(NULL)) { + if (conf_write(NULL)) { fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); exit(1); } diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 07597611cc5..df6a188b993 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -222,10 +222,8 @@ load: continue; if (def == S_DEF_USER) { sym = sym_find(line + 9); - if (!sym) { - conf_warning("trying to assign nonexistent symbol %s", line + 9); + if (!sym) break; - } } else { sym = sym_lookup(line + 9, 0); if (sym->type == S_UNKNOWN) @@ -261,10 +259,8 @@ load: } if (def == S_DEF_USER) { sym = sym_find(line + 7); - if (!sym) { - conf_warning("trying to assign nonexistent symbol %s", line + 7); + if (!sym) break; - } } else { sym = sym_lookup(line + 7, 0); if (sym->type == S_UNKNOWN) |