about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <mcgrathr@chromium.org>2011-08-31 13:13:24 -0700
committerRoland McGrath <mcgrathr@chromium.org>2011-08-31 13:13:24 -0700
commit448f6a4dfbdc9c9e2b410f5ea52e51b0667ee742 (patch)
treebb4b64a72c78bd0a5debb19b0c5aebcff9d6eb33
parent78856c5c73f74d2a850da0a62393dca9dd5a2df4 (diff)
downloadglibc-448f6a4dfbdc9c9e2b410f5ea52e51b0667ee742.tar.gz
glibc-448f6a4dfbdc9c9e2b410f5ea52e51b0667ee742.tar.xz
glibc-448f6a4dfbdc9c9e2b410f5ea52e51b0667ee742.zip
Revert "Install bits/timex.h header."
This reverts commit c81fb726d822c5c5296c21c9d47c323ce14aa723.

Conflicts:

	ChangeLog
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
2 files changed, 1 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f2a92bf9e..84def3c4cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -139,11 +139,6 @@
 	Maintain aligned stack.
 	(CHECK_RSP): Remove unused macro.
 
-2011-04-01  Andreas Schwab  <schwab@redhat.com>
-
-	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
-	bits/timex.h
-
 2011-03-18  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #12583]
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 803d9eec85..cee5d29255 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -95,7 +95,7 @@ generated += syscall-list.h syscall-list.d
 endif
 
 ifeq ($(subdir),time)
-sysdep_headers += sys/timex.h bits/timex.h
+sysdep_headers += sys/timex.h
 
 sysdep_routines += ntp_gettime
 endif