From owner-p4-projects@FreeBSD.ORG  Thu Jul 27 12:29:32 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 17FCF16A4E0; Thu, 27 Jul 2006 12:29:32 +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 D999016A4DE
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 12:29:31 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 527CB43D53
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 12:29:31 +0000 (GMT)
	(envelope-from cognet@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 k6RCTV4h069301
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 12:29:31 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RCTVC7069298
	for perforce@freebsd.org; Thu, 27 Jul 2006 12:29:31 GMT
	(envelope-from cognet@freebsd.org)
Date: Thu, 27 Jul 2006 12:29:31 GMT
Message-Id: <200607271229.k6RCTVC7069298@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102551 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: Thu, 27 Jul 2006 12:29:32 -0000

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

Change 102551 by cognet@cognet on 2006/07/27 12:28:41

	Grrr use the pci softc there too.

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#6 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#6 (text+ko) ====

@@ -130,8 +130,8 @@
 	reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOUTR);
 	reg |= 1U << GPIO_PCI_RESET;
 	GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg | (1U << GPIO_PCI_RESET));
-	sc->sc_irq_rman.rm_type = RMAN_ARRAY;
-	sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs";
+	pci_sc->sc_irq_rman.rm_type = RMAN_ARRAY;
+	pci_sc->sc_irq_rman.rm_descr = "IXP425 PCI IRQs";
 	CTASSERT(PCI_INT_D < PCI_INT_A);
 	/* XXX this overlaps the irq's setup in ixp425_attach */
 	if (rman_init(&pci_sc->sc_irq_rman) != 0 ||