From owner-p4-projects@FreeBSD.ORG  Sat May 27 23:32:27 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 9294F16B5F1; Sat, 27 May 2006 23:19:39 +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 985E316CC89
	for <perforce@FreeBSD.org>; Sat, 27 May 2006 23:05:49 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6490243D55
	for <perforce@FreeBSD.org>; Sat, 27 May 2006 23:05:49 +0000 (GMT)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4RN4hCd034290
	for <perforce@FreeBSD.org>; Sat, 27 May 2006 23:04:43 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4RN4hnq034287
	for perforce@freebsd.org; Sat, 27 May 2006 23:04:43 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 27 May 2006 23:04:43 GMT
Message-Id: <200605272304.k4RN4hnq034287@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>
Cc: 
Subject: PERFORCE change 97976 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: Sat, 27 May 2006 23:32:47 -0000

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

Change 97976 by hselasky@hselasky_mini_itx on 2006/05/27 23:03:50

	Compilation fix(es).

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_ethersubr.c#3 delete
.. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#3 edit

Differences ...

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

@@ -521,7 +521,7 @@
 
 	mtx_unlock(&usb_global_lock);
 
-	USB_ATTACH_SUCCESS_RETURN;
+	return 0; /* return success */
 }
 
 static void

==== //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#3 (text+ko) ====

@@ -48,10 +48,6 @@
 #include "usbdevs.h"
 #include <dev/usb/usb_quirks.h>
 
-#ifdef USB_DEBUG
-extern int usbdebug;
-#endif
-
 #define ANY 0xffff
 
 Static const struct usbd_quirk_entry {

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

@@ -271,7 +271,7 @@
 					 * flag is also exported by usb.h
 					 */
 #endif
-#ifdef USB_COMPAT_OLD
+#if (defined(USB_COMPAT_OLD) || 1)
 #define USBD_CUSTOM_CLEARSTALL   0x0008 /* used to disable automatic clear-stall
 					 * when a device reset request is needed
 					 * in addition to the clear stall request