Merge branch 'from-linus' into upstream

[linux-2.6] / scripts / kconfig / confdata.c

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index b0cbbe2e41bb372c36a9aa152b44ab78607b0a62..1b5df589f3aecc12f3c0b8bde93526c84c0a60ec 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -325,7 +325,7 @@ int conf_read(const char *name)
                                sym->flags |= e->right.sym->flags & SYMBOL_NEW;
        }
 
-       sym_change_count = conf_warnings && conf_unsaved;
+       sym_change_count = conf_warnings || conf_unsaved;
 
        return 0;
 }
@@ -374,6 +374,7 @@ int conf_write(const char *name)
                out_h = fopen(".tmpconfig.h", "w");
                if (!out_h)
                        return 1;
+               file_write_dep(NULL);
        }
        sym = sym_lookup("KERNELVERSION", 0);
        sym_calc_value(sym);
@@ -512,7 +513,6 @@ int conf_write(const char *name)
        if (out_h) {
                fclose(out_h);
                rename(".tmpconfig.h", "include/linux/autoconf.h");
-               file_write_dep(NULL);
        }
        if (!name || basename != conf_def_filename) {
                if (!name)