From: Roland McGrath <mcgrathr@chromium.org>
Date: Wed, 31 Aug 2011 20:13:24 +0000 (-0700)
Subject: Revert "Install bits/timex.h header."
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=448f6a4dfbdc9c9e2b410f5ea52e51b0667ee742;p=thirdparty%2Fglibc.git

Revert "Install bits/timex.h header."

This reverts commit c81fb726d822c5c5296c21c9d47c323ce14aa723.

Conflicts:

	ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 0f2a92bf9e0..84def3c4ccb 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 803d9eec85e..cee5d29255d 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