From owner-p4-projects@FreeBSD.ORG  Thu Oct 14 22:10:26 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3D9410656A4; Thu, 14 Oct 2010 22:10:26 +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 6C18F1065679
	for <perforce@FreeBSD.org>; Thu, 14 Oct 2010 22:10:26 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 58BEC8FC1C
	for <perforce@FreeBSD.org>; Thu, 14 Oct 2010 22:10:26 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9EMAQgG011349
	for <perforce@FreeBSD.org>; Thu, 14 Oct 2010 22:10:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9EMAQ2E011346
	for perforce@freebsd.org; Thu, 14 Oct 2010 22:10:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 14 Oct 2010 22:10:26 GMT
Message-Id: <201010142210.o9EMAQ2E011346@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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 184740 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: Thu, 14 Oct 2010 22:10:27 -0000

http://p4web.freebsd.org/@@184740?ac=10

Change 184740 by hselasky@hselasky_laptop001 on 2010/10/14 22:10:21

	
	IFC

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#25 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdi.h#22 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#25 (text+ko) ====

@@ -1,3 +1,5 @@
+/* $FreeBSD: src/sys/dev/usb/controller/xhci.h,v 1.1 2010/10/03 08:12:17 hselasky Exp $ */
+
 /*-
  * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb/usbdi.h#22 (text+ko) ====

@@ -81,7 +81,6 @@
 #define	USB_USER_DATA_PTR	0x0020	/* internal flag */
 #define	USB_MULTI_SHORT_OK	0x0040	/* allow multiple short frames */
 #define	USB_MANUAL_STATUS	0x0080	/* manual ctrl status */
-#define	USB_DRY_RUN		0x0100	/* only setup control endpoint */
 
 #define	USB_NO_TIMEOUT 0
 #define	USB_DEFAULT_TIMEOUT 5000	/* 5000 ms = 5 seconds */