From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 17 15:25:33 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D36CE106564A;
	Sun, 17 Oct 2010 15:25:33 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C08018FC0A;
	Sun, 17 Oct 2010 15:25:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9HFPX2Y036039;
	Sun, 17 Oct 2010 15:25:33 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9HFPXTT036037;
	Sun, 17 Oct 2010 15:25:33 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201010171525.o9HFPXTT036037@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sun, 17 Oct 2010 15:25:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213980 - stable/8/usr.sbin/ntp
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Oct 2010 15:25:33 -0000

Author: glebius
Date: Sun Oct 17 15:25:33 2010
New Revision: 213980
URL: http://svn.freebsd.org/changeset/base/213980

Log:
  Merge 213831:
    Enable the shared memory reference clock driver. The GPS devices are
    getting more and more popular, as source of precise time, and the gpsd
    daemon from ports is using the shared memory to synchronize with ntpd.
  
    Reviewed by:  roberto

Modified:
  stable/8/usr.sbin/ntp/config.h
Directory Properties:
  stable/8/usr.sbin/ntp/   (props changed)

Modified: stable/8/usr.sbin/ntp/config.h
==============================================================================
--- stable/8/usr.sbin/ntp/config.h	Sun Oct 17 15:22:59 2010	(r213979)
+++ stable/8/usr.sbin/ntp/config.h	Sun Oct 17 15:25:33 2010	(r213980)
@@ -126,7 +126,7 @@
 /* #undef CLOCK_SCHMID */
 
 /* clock thru shared memory */
-/* #undef CLOCK_SHM */
+#define CLOCK_SHM
 
 /* Spectracom 8170/Netclock/2 WWVB receiver */
 /* #undef CLOCK_SPECTRACOM */