diff options
| author | roberto <roberto@FreeBSD.org> | 2002-11-04 19:38:46 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2002-11-04 19:38:46 +0000 |
| commit | ad0bca971a9d806fee6a0bacb8f3a55b3e2a6ec0 (patch) | |
| tree | f9bedaf87253bd22f25714971b90f734fca31a1d /contrib/ntp/ntpd/ntp_control.c | |
| parent | 8f8f22cd2ab105b81ae68bd7cf1df69e51f79b6a (diff) | |
| download | FreeBSD-src-ad0bca971a9d806fee6a0bacb8f3a55b3e2a6ec0.zip FreeBSD-src-ad0bca971a9d806fee6a0bacb8f3a55b3e2a6ec0.tar.gz | |
Merge conflicts.
MFC after: 1 month
Diffstat (limited to 'contrib/ntp/ntpd/ntp_control.c')
| -rw-r--r-- | contrib/ntp/ntpd/ntp_control.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c index af667b5..1d428a2 100644 --- a/contrib/ntp/ntpd/ntp_control.c +++ b/contrib/ntp/ntpd/ntp_control.c @@ -403,6 +403,8 @@ static u_char clocktypes[] = { CTL_SST_TS_LF, /* REFCLK_JJY (40) */ CTL_SST_TS_UHF, /* REFCLK_TT560 (41) */ CTL_SST_TS_UHF, /* REFCLK_ZYFER (42) */ + CTL_SST_TS_UHF, /* REFCLK_RIPENCC (43) */ + CTL_SST_TS_UHF, /* REFCLK_NEOCLOCK4X (44) */ }; |
