From owner-svn-src-projects@FreeBSD.ORG  Mon Nov  9 16:43:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBC451065694;
	Mon,  9 Nov 2009 16:43:50 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DBC1B8FC22;
	Mon,  9 Nov 2009 16:43: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 nA9GhoSs027313;
	Mon, 9 Nov 2009 16:43:50 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9GhoxX027311;
	Mon, 9 Nov 2009 16:43:50 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200911091643.nA9GhoxX027311@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 9 Nov 2009 16:43:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199091 - projects/mips/sys/dev/rmi/xlr
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2009 16:43:51 -0000

Author: rrs
Date: Mon Nov  9 16:43:50 2009
New Revision: 199091
URL: http://svn.freebsd.org/changeset/base/199091

Log:
  Cooresponding hack to pass in the irq

Modified:
  projects/mips/sys/dev/rmi/xlr/rge.c

Modified: projects/mips/sys/dev/rmi/xlr/rge.c
==============================================================================
--- projects/mips/sys/dev/rmi/xlr/rge.c	Mon Nov  9 16:43:02 2009	(r199090)
+++ projects/mips/sys/dev/rmi/xlr/rge.c	Mon Nov  9 16:43:50 2009	(r199091)
@@ -1925,7 +1925,8 @@ rge_attach(device_t dev)
 	sc->irq = gmac_conf->baseirq + priv->instance % 4;
 
 	/* Set the IRQ into the rid field */
-	rman_set_rid(&sc->rge_irq, sc->irq);
+	/* note this is a hack to pass the irq to the iodi interrupt setup routines */
+	sc->rge_irq.__r_i = (struct resource_i *)sc->irq;
 
 	ret = bus_setup_intr(dev, &sc->rge_irq, INTR_FAST | INTR_TYPE_NET | INTR_MPSAFE,
 	    NULL, rge_intr, sc, &sc->rge_intrhand);