From owner-trustedbsd-cvs@FreeBSD.ORG  Fri Oct 20 01:07:07 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A816E16A40F
	for <trustedbsd-cvs@freebsd.org>; Fri, 20 Oct 2006 01:07:07 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F44843D55
	for <trustedbsd-cvs@freebsd.org>; Fri, 20 Oct 2006 01:07:02 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id B6EE646E1D
	for <trustedbsd-cvs@trustedbsd.org>;
	Thu, 19 Oct 2006 21:07:01 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id D59AD5CF90;
	Fri, 20 Oct 2006 01:06:16 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC5AF16A47B; Fri, 20 Oct 2006 01:06:16 +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 6D95516A412
	for <perforce@freebsd.org>; Fri, 20 Oct 2006 01:06:16 +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 D2F5143D55
	for <perforce@freebsd.org>; Fri, 20 Oct 2006 01:06:15 +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 k9K16FTB093818
	for <perforce@freebsd.org>; Fri, 20 Oct 2006 01:06:15 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 k9K16FII093815
	for perforce@freebsd.org; Fri, 20 Oct 2006 01:06:15 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 20 Oct 2006 01:06:15 GMT
Message-Id: <200610200106.k9K16FII093815@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 108145 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Oct 2006 01:07:07 -0000

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

Change 108145 by rwatson@rwatson_zoo on 2006/10/20 01:05:41

	Merge built nit fix from HEAD to RELENG_6 priv(9).

Affected files ...

.. //depot/projects/trustedbsd/priv6/src/sys/dev/cnw/if_cnw.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/priv6/src/sys/dev/cnw/if_cnw.c#3 (text+ko) ====

@@ -125,7 +125,6 @@
 #include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <sys/ioctl.h>
-#include <sys/priv.h>
 #include <sys/proc.h>
 
 #include <net/if.h>
@@ -237,6 +236,7 @@
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
+#include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/ucred.h>
 #include <sys/socket.h>