From owner-p4-projects@FreeBSD.ORG  Mon May 10 11:44:51 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3AE1D1065673; Mon, 10 May 2010 11:44:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F3870106564A
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 11:44:50 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E14A58FC18
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 11:44:50 +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 o4ABioIl080562
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 11:44:50 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ABioVt080560
	for perforce@freebsd.org; Mon, 10 May 2010 11:44:50 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 10 May 2010 11:44:50 GMT
Message-Id: <201005101144.o4ABioVt080560@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 178031 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, 10 May 2010 11:44:51 -0000

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

Change 178031 by hselasky@hselasky_laptop001 on 2010/05/10 11:44:12

	
	IFC @ 177760 (more)

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#32 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#44 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumfw.h#4 integrate

Differences ...

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

@@ -89,7 +89,7 @@
 #define	AT9100_DCI_PC2SC(pc) \
    AT9100_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus)
 
-#if USB_DEBUG
+#ifdef USB_DEBUG
 static int at91dcidebug = 0;
 
 SYSCTL_NODE(_hw_usb, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci");

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

@@ -81,7 +81,7 @@
 #define	ATMEGA_PC2SC(pc) \
    ATMEGA_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus)
 
-#if USB_DEBUG
+#ifdef USB_DEBUG
 static int atmegadci_debug = 0;
 
 SYSCTL_NODE(_hw_usb, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI");

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

@@ -81,7 +81,7 @@
 #define	AVR32_PC2SC(pc) \
    AVR32_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus)
 
-#if USB_DEBUG
+#ifdef USB_DEBUG
 static int avr32dci_debug = 0;
 
 SYSCTL_NODE(_hw_usb, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI");

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

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