From owner-svn-src-user@FreeBSD.ORG  Fri Apr 30 00:06:50 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 217FC106566C;
	Fri, 30 Apr 2010 00:06:50 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 101C78FC1A;
	Fri, 30 Apr 2010 00:06:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3U06nGK099548;
	Fri, 30 Apr 2010 00:06:49 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3U06nbG099546;
	Fri, 30 Apr 2010 00:06:49 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004300006.o3U06nbG099546@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 30 Apr 2010 00:06:49 +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: r207407 - user/jmallett/octeon/sys/mips/cavium
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: Fri, 30 Apr 2010 00:06:50 -0000

Author: jmallett
Date: Fri Apr 30 00:06:49 2010
New Revision: 207407
URL: http://svn.freebsd.org/changeset/base/207407

Log:
  Actually initialize the IRQ rman, even though I'm not populating it yet.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octopci.c

Modified: user/jmallett/octeon/sys/mips/cavium/octopci.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octopci.c	Thu Apr 29 23:48:09 2010	(r207406)
+++ user/jmallett/octeon/sys/mips/cavium/octopci.c	Fri Apr 30 00:06:49 2010	(r207407)
@@ -136,6 +136,11 @@ octopci_attach(device_t dev)
 		return (error);
 
 	/* XXX IRQs? */
+	sc->sc_irq.rm_type = RMAN_ARRAY;
+	sc->sc_irq.rm_descr = "Cavium Octeon PCI Interrupts";
+	error = rman_init(&sc->sc_irq);
+	if (error != 0)
+		return (error);
 
 	device_add_child(dev, "pci", 0);