From owner-cvs-src@FreeBSD.ORG  Wed Jul  2 17:40:40 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68305106570C;
	Wed,  2 Jul 2008 17:40:40 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F43E8FC19;
	Wed,  2 Jul 2008 17:40:39 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m62HedME074667;
	Wed, 2 Jul 2008 17:40:39 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m62HedKY074666;
	Wed, 2 Jul 2008 17:40:39 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <200807021740.m62HedKY074666@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rwatson@repoman.freebsd.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 2 Jul 2008 17:40:34 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7
Cc: 
Subject: cvs commit: src/sys/conf files
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jul 2008 17:40:40 -0000

rwatson     2008-07-02 17:40:34 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/conf             files 
  Log:
  SVN rev 180192 on 2008-07-02 17:40:34Z by rwatson
  
  Merge files:1.1309 (r179787) from head to stable/7:
  
    When NETATALK is compiled into the kernel, at_rmx.c is required regardless
    of whether NETATALKDEBUG is enabled, so make building it conditional on
    NETATALK instead.  This problem appears to have been present from the time
    that the netatalk implementation was imported.
  
    PR:             124456
    Submitted by:   Nathan Whitehorn <whitehorn at wisc dot edu>
  
  Revision     Changes    Path
  1.1243.2.25  +1 -1      src/sys/conf/files