From owner-p4-projects@FreeBSD.ORG  Mon Mar  8 17:26:20 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D8651065673; Mon,  8 Mar 2010 17:26:20 +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 01D1F106566B
	for <perforce@FreeBSD.org>; Mon,  8 Mar 2010 17:26:20 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E3AA58FC0A
	for <perforce@FreeBSD.org>; Mon,  8 Mar 2010 17:26:19 +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 o28HQJFf004179
	for <perforce@FreeBSD.org>; Mon, 8 Mar 2010 17:26:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o28HQJik004177
	for perforce@freebsd.org; Mon, 8 Mar 2010 17:26:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 8 Mar 2010 17:26:19 GMT
Message-Id: <201003081726.o28HQJik004177@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 175480 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 08 Mar 2010 17:26:20 -0000

http://p4web.freebsd.org/chv.cgi?CH=175480

Change 175480 by hselasky@hselasky_laptop001 on 2010/03/08 17:25:43

	
	IFC @ 175475
		- more files to revert

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralreg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydfw.h#4 integrate
.. //depot/projects/usb/src/sys/sys/systm.h#24 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uralreg.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: head/sys/dev/usb/wlan/if_uralreg.h 188942 2009-02-23 18:31:00Z thompsa $	*/
+/*	$FreeBSD: src/sys/dev/usb/wlan/if_uralreg.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_zydfw.h#4 (text+ko) ====

@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD: head/sys/dev/usb/wlan/if_zydfw.h 188942 2009-02-23 18:31:00Z thompsa $	*/
+/*	$FreeBSD: src/sys/dev/usb/wlan/if_zydfw.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $	*/
 
 uint8_t zd1211_firmware[] = {
 	0x08, 0x91, 0xFF, 0xED, 0x09, 0x93, 0x1E, 0xEE,

==== //depot/projects/usb/src/sys/sys/systm.h#24 (text+ko) ====

@@ -341,8 +341,15 @@
 /* XXX: Should be void nanodelay(u_int nsec); */
 void	DELAY(int usec);
 
+/* Root mount holdback API */
+struct root_hold_token;
+
+struct root_hold_token *root_mount_hold(const char *identifier);
+void root_mount_rel(struct root_hold_token *h);
+void root_mount_wait(void);
 int root_mounted(void);
 
+
 /*
  * Unit number allocation API. (kern/subr_unit.c)
  */