From owner-svn-src-user@FreeBSD.ORG  Wed Nov 30 17:36:01 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D39CF1065672;
	Wed, 30 Nov 2011 17:36:01 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AA5788FC27;
	Wed, 30 Nov 2011 17:36:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAUHa1ur007274;
	Wed, 30 Nov 2011 17:36:01 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAUHa1G2007271;
	Wed, 30 Nov 2011 17:36:01 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201111301736.pAUHa1G2007271@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Wed, 30 Nov 2011 17:36:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228155 - user/sbruno/1394dev/firewire
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Nov 2011 17:36:01 -0000

Author: sbruno
Date: Wed Nov 30 17:36:01 2011
New Revision: 228155
URL: http://svn.freebsd.org/changeset/base/228155

Log:
  Merge to HEAD

Modified:
  user/sbruno/1394dev/firewire/firewire.c
  user/sbruno/1394dev/firewire/fwohci_pci.c
Directory Properties:
  user/sbruno/1394dev/firewire/   (props changed)

Modified: user/sbruno/1394dev/firewire/firewire.c
==============================================================================
--- user/sbruno/1394dev/firewire/firewire.c	Wed Nov 30 14:17:20 2011	(r228154)
+++ user/sbruno/1394dev/firewire/firewire.c	Wed Nov 30 17:36:01 2011	(r228155)
@@ -30,11 +30,11 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- * 
- * $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -128,9 +128,8 @@ static device_method_t firewire_methods[
 
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	firewire_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 char *linkspeed[] = {
 	"S100", "S200", "S400", "S800",

Modified: user/sbruno/1394dev/firewire/fwohci_pci.c
==============================================================================
--- user/sbruno/1394dev/firewire/fwohci_pci.c	Wed Nov 30 14:17:20 2011	(r228154)
+++ user/sbruno/1394dev/firewire/fwohci_pci.c	Wed Nov 30 17:36:01 2011	(r228155)
@@ -30,10 +30,11 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- * 
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define BOUNCE_BUFFER_TEST	0
 
 #include <sys/param.h>
@@ -536,9 +537,8 @@ static device_method_t fwohci_methods[] 
 
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	fwohci_pci_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fwohci_driver = {