Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

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

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 9fba838c7069c4cb71d3fbd9c109e0f951c5e340..36b5eedcdc7518d9dc734078c2287e16cca9f4d0 100644 (file)
--- 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);
        }