From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 28 Jun 2002 05:42:08 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_1_73~134^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=956d98290ff31e668edd0fe72eabe32769c000e8;p=thirdparty%2Fntp.git

merge cleanup

bk: 3d1bf7300yrFohmIbequ411Ck1fIbQ
---

956d98290ff31e668edd0fe72eabe32769c000e8
diff --cc libntp/clocktypes.c
index 45588824aa,4e425c544b..62e508ae32
--- a/libntp/clocktypes.c
+++ b/libntp/clocktypes.c
@@@ -84,18 -84,20 +84,20 @@@ struct clktype clktypes[] = 
  	  "PCF"},
  	{ REFCLK_WWV_AUDIO,	"WWV/H Audio Demodulator/Decoder (36)",
  	  "WWV_AUDIO"},
--	{ REFCLK_FG,	"Forum Graphic GPS Dating Station (37)",
++	{ REFCLK_FG,		"Forum Graphic GPS Dating Station (37)",
  	  "GPS_FG"},
  	{ REFCLK_HOPF_SERIAL,	"hopf Elektronic serial line receiver (38)",
  	  "HOPF_S"},
  	{ REFCLK_HOPF_PCI,	"hopf Elektronic PCI receiver (39)",
  	  "HOPF_P"},
 -	{ REFCLK_JJY,	"JJY receiver (40)",
 -	  "JJY" },
 +	{ REFCLK_JJY,		"JJY receiver (40)",
 +	  "JJY"},
  	{ REFCLK_TT560,		"TrueTime 560 IRIG-B decoder (41)",
  	  "TT_IRIG"},
 -	{ REFCLK_ZYFER,	"Zyfer GPStarplus receiver (42)",
 +	{ REFCLK_ZYFER,		"Zyfer GPStarplus receiver (42)",
  	  "GPS_ZYFER" },
+ 	{ REFCLK_RIPENCC,	"RIPE NCC Trimble driver (43)",
+ 	  "GPS_RIPENCC" },
  	{ -1,			"", "" }
  };