diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 07:40:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 07:40:56 -0400 |
| commit | 251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3 (patch) | |
| tree | 3c20c3e080f276848f2ad67aadab44a5d64bfda9 /scripts/kconfig/conf.c | |
| parent | 6679ce6e5f519096612b480d255d9ca97be0c2be (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'scripts/kconfig/conf.c')
| -rw-r--r-- | scripts/kconfig/conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 9fba838c7069..36b5eedcdc75 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
| @@ -596,7 +596,7 @@ int main(int ac, char **av) | |||
| 596 | break; | 596 | break; |
| 597 | } | 597 | } |
| 598 | 598 | ||
| 599 | if (conf_get_changed() && conf_write(NULL)) { | 599 | if (conf_write(NULL)) { |
| 600 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 600 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); |
| 601 | exit(1); | 601 | exit(1); |
| 602 | } | 602 | } |