summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/confdata.c
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-05-24 17:16:21 +0200
committerMichal Marek <mmarek@suse.cz>2011-05-24 17:16:21 +0200
commit51f31afd12b28eddccd29a94ffbd41cb15eadd39 (patch)
tree658d371aba4a2b63a8bc94a080701291031799f7 /scripts/kconfig/confdata.c
parentde125187dc17e3715ba983adf60faecfdc3a64c4 (diff)
parentbdebd4892e05cc9068659f25af33c6b322034eb2 (diff)
downloadlinux-stable-51f31afd12b28eddccd29a94ffbd41cb15eadd39.tar.gz
linux-stable-51f31afd12b28eddccd29a94ffbd41cb15eadd39.tar.bz2
linux-stable-51f31afd12b28eddccd29a94ffbd41cb15eadd39.zip
Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig
Diffstat (limited to 'scripts/kconfig/confdata.c')
-rw-r--r--scripts/kconfig/confdata.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index db06af0321b3..a1a9872e4a2d 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -560,8 +560,6 @@ int conf_write(const char *name)
const char *basename;
const char *str;
char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
- time_t now;
- int use_timestamp = 1;
char *env;
dirname[0] = 0;
@@ -598,19 +596,11 @@ int conf_write(const char *name)
if (!out)
return 1;
- time(&now);
- env = getenv("KCONFIG_NOTIMESTAMP");
- if (env && *env)
- use_timestamp = 0;
-
fprintf(out, _("#\n"
"# Automatically generated make config: don't edit\n"
"# %s\n"
- "%s%s"
"#\n"),
- rootmenu.prompt->text,
- use_timestamp ? "# " : "",
- use_timestamp ? ctime(&now) : "");
+ rootmenu.prompt->text);
if (!conf_get_changed())
sym_clear_all_valid();