From owner-p4-projects@FreeBSD.ORG  Sun Aug 30 11:19:45 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F139B1065673; Sun, 30 Aug 2009 11:19:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AFEA6106566C
	for <perforce@freebsd.org>; Sun, 30 Aug 2009 11:19:44 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9EC928FC12
	for <perforce@freebsd.org>; Sun, 30 Aug 2009 11:19:44 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UBJiV4078426
	for <perforce@freebsd.org>; Sun, 30 Aug 2009 11:19:44 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7UBJiH4078424
	for perforce@freebsd.org; Sun, 30 Aug 2009 11:19:44 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 30 Aug 2009 11:19:44 GMT
Message-Id: <200908301119.n7UBJiH4078424@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167975 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Aug 2009 11:19:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=167975

Change 167975 by trasz@trasz_anger on 2009/08/30 11:19:21

	Remove a delta that has somehow snuck in.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#27 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#27 (text+ko) ====

@@ -85,10 +85,6 @@
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 
-options		IPSEC
-device		crypto
-device		carp
-
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC