From owner-p4-projects@FreeBSD.ORG  Mon Jun  5 16:10:28 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FFE316AB19; Mon,  5 Jun 2006 16:10:27 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6A37516A886
	for <perforce@freebsd.org>; Mon,  5 Jun 2006 16:10:24 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 16CC443D46
	for <perforce@freebsd.org>; Mon,  5 Jun 2006 16:10:24 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55G8ds2012916
	for <perforce@freebsd.org>; Mon, 5 Jun 2006 16:08:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55G8dW7012913
	for perforce@freebsd.org; Mon, 5 Jun 2006 16:08:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 5 Jun 2006 16:08:39 GMT
Message-Id: <200606051608.k55G8dW7012913@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 98576 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: Mon, 05 Jun 2006 16:10:38 -0000

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

Change 98576 by rwatson@rwatson_zoo on 2006/06/05 16:08:05

	Remove mismerge for second include of audit.h.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#16 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#16 (text+ko) ====

@@ -59,8 +59,6 @@
 #include <sys/vnode.h>
 #include <vm/uma.h>
 
-#include <security/audit/audit.h>
-
 #include <geom/geom.h>
 
 #include <machine/stdarg.h>