2 files changed, 3 insertions, 88 deletions

diff --git a/include/Makefile b/include/Makefile
index 8e7c317d4a2b..f79e7b13b0ce 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-#	$Id: Makefile,v 1.91 1999/01/14 19:52:38 jdp Exp $
+#	$Id: Makefile,v 1.92 1999/01/17 22:35:09 dt Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -16,7 +16,7 @@ FILES=	a.out.h ar.h assert.h bitstring.h ctype.h db.h dirent.h disktab.h \
 	paths.h pthread.h pthread_np.h pwd.h \
 	ranlib.h regex.h regexp.h resolv.h rune.h runetype.h setjmp.h sgtty.h \
 	signal.h stab.h stddef.h stdio.h stdlib.h string.h stringlist.h \
-	strings.h struct.h sysexits.h tar.h time.h timepps.h timers.h \
+	strings.h struct.h sysexits.h tar.h time.h timers.h \
 	ttyent.h unistd.h utime.h utmp.h vis.h
 .if defined(WANT_CSRG_LIBM)
 FILES+=	math.h
@@ -63,6 +63,7 @@ osreldate.h:	${.CURDIR}/../sys/conf/newvers.sh \
 	echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h
 
 beforeinstall: ${SHARED}
+	@rm -f ${DESTDIR}/usr/include/timepps.h
 	cd ${.CURDIR}; \
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${FILES} ${DESTDIR}/usr/include
diff --git a/include/timepps.h b/include/timepps.h
deleted file mode 100644
index c9277cec2d7c..000000000000
--- a/include/timepps.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $Id$
- *
- * The is a FreeBSD protype version of the "draft-mogul-pps-api-02.txt" 
- * specification for Pulse Per Second timing interfaces.
- *
- */
-
-#ifndef _TIME_PPS_H_
-#define	_TIME_PPS_H_
-
-#include <sys/timepps.h>
-
-int time_pps_create(int filedes, pps_handle_t *handle);
-int time_pps_destroy(pps_handle_t handle);
-int time_pps_setparams(pps_handle_t handle, const pps_params_t *ppsparams);
-int time_pps_getparams(pps_handle_t handle, pps_params_t *ppsparams);
-int time_pps_getcap(pps_handle_t handle, int *mode);
-int time_pps_fetch(pps_handle_t handle, pps_info_t *ppsinfobuf);
-int time_pps_wait(pps_handle_t handle, const struct timespec *timeout, 
-	pps_info_t *ppsinfobuf);
-
-__inline int
-time_pps_create(int filedes, pps_handle_t *handle)
-{
-	int error;
-
-	*handle = -1;
-	error = ioctl(filedes, PPS_IOC_CREATE, 0);
-	if (error < 0) 
-		return (-1);
-	*handle = filedes;
-	return (0);
-}
-
-__inline int
-time_pps_destroy(pps_handle_t handle)
-{
-	return (ioctl(handle, PPS_IOC_DESTROY, 0));
-}
-
-__inline int
-time_pps_setparams(pps_handle_t handle, const pps_params_t *ppsparams)
-{
-	return (ioctl(handle, PPS_IOC_SETPARAMS, ppsparams));
-}
-
-__inline int
-time_pps_getparams(pps_handle_t handle, pps_params_t *ppsparams)
-{
-	return (ioctl(handle, PPS_IOC_GETPARAMS, ppsparams));
-}
-
-__inline int 
-time_pps_getcap(pps_handle_t handle, int *mode)
-{
-	return (ioctl(handle, PPS_IOC_GETCAP, mode));
-}
-
-__inline int
-time_pps_fetch(pps_handle_t handle, pps_info_t *ppsinfobuf)
-{
-	return (ioctl(handle, PPS_IOC_FETCH, ppsinfobuf));
-}
-
-__inline int
-time_pps_wait(pps_handle_t handle, const struct timespec *timeout,
-        pps_info_t *ppsinfobuf)
-{
-	int error;
-	struct pps_wait_args arg;
-
-	arg.timeout = *timeout;
-	error = ioctl(handle, PPS_IOC_WAIT, &arg);
-	*ppsinfobuf = arg.pps_info_buf;
-	return (error);
-}
-
-#endif /* !_TIME_PPS_H_ */