diff options
author | roberto <roberto@FreeBSD.org> | 2013-10-02 21:47:25 +0000 |
---|---|---|
committer | roberto <roberto@FreeBSD.org> | 2013-10-02 21:47:25 +0000 |
commit | 960b6b30ed20dfbb0608efdfbdc9fed89cf836e4 (patch) | |
tree | 97b60bf9143d1dd744a5d4c84adbbe390d5ff45e /usr.sbin/ntp | |
parent | 515e096f7236fe4f554e196c769fc056df993849 (diff) | |
download | FreeBSD-src-960b6b30ed20dfbb0608efdfbdc9fed89cf836e4.zip FreeBSD-src-960b6b30ed20dfbb0608efdfbdc9fed89cf836e4.tar.gz |
Meinberg clocks support was inadvertently removed during the last vendor
import. Add it back.
PR: bin/182545
Submitted by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Approved by: re (delphij)
MFC after: 1 week
Diffstat (limited to 'usr.sbin/ntp')
-rw-r--r-- | usr.sbin/ntp/config.h | 2 | ||||
-rw-r--r-- | usr.sbin/ntp/libparse/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index efa42d2..41622f1 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -84,7 +84,7 @@ #define CLOCK_LOCAL 1 /* Meinberg clocks */ -/* #undef CLOCK_MEINBERG */ +#define CLOCK_MEINBERG 1 /* Magnavox MX4200 GPS receiver */ /* #undef CLOCK_MX4200 */ diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index f86988e..9ccc4b3 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -9,7 +9,7 @@ SRCS= clk_computime.c clk_dcf7000.c clk_hopf6021.c clk_meinberg.c \ clk_rawdcf.c clk_rcc8000.c clk_schmid.c clk_trimtaip.c \ clk_trimtsip.c clk_varitext.c clk_wharton.c data_mbg.c \ info_trimble.c parse.c parse_conf.c trim_info.c \ - binio.c gpstolfp.c + binio.c gpstolfp.c ieee754io.c mfp_mul.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ |