merge cleanup

bk: 3d1bf7300yrFohmIbequ411Ck1fIbQ

diff --cc configure.in
Simple merge

diff --cc include/ntp.h
Simple merge

diff --cc libntp/clocktypes.c
index 45588824aa1939fb5dc42984ff84732731d83fbd,4e425c544b436d5ec248121f4a6f9f75e9ef8cf1..62e508ae329957f0a2aa58d88085be4ea2664241
--- 1/libntp/clocktypes.c
--- 2/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,                   "", "" }
  };
  

diff --cc ntpd/Makefile.am
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge