From owner-svn-src-projects@FreeBSD.ORG  Mon May 17 19:19:48 2010
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 AA1FF106564A;
	Mon, 17 May 2010 19:19:48 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99FB58FC19;
	Mon, 17 May 2010 19:19:48 +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 o4HJJm0r014798;
	Mon, 17 May 2010 19:19:48 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4HJJmEW014796;
	Mon, 17 May 2010 19:19:48 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201005171919.o4HJJmEW014796@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 17 May 2010 19:19:48 +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: r208211 - projects/ppc64/sys/powerpc/ofw
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, 17 May 2010 19:19:48 -0000

Author: nwhitehorn
Date: Mon May 17 19:19:48 2010
New Revision: 208211
URL: http://svn.freebsd.org/changeset/base/208211

Log:
  Fix mismerge -- make sure that the interrupt sense from the device tree is
  configured on the appropriate PIC.
  
  Reported by:	Andreas Tobler

Modified:
  projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c

Modified: projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c
==============================================================================
--- projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c	Mon May 17 19:13:49 2010	(r208210)
+++ projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c	Mon May 17 19:19:48 2010	(r208211)
@@ -216,7 +216,8 @@ ofw_pcibus_enum_devtree(device_t dev, u_
 					intr[0] = INTR_VEC(iparent, intr[0]);
 
 				if (iparent != 0 && icells > 1) {
-					powerpc_config_intr(intr[0],
+					powerpc_config_intr(
+					    INTR_VEC(iparent, intr[0]),
 					    (intr[1] & 1) ? INTR_TRIGGER_LEVEL :
 					    INTR_TRIGGER_EDGE,
 					    INTR_POLARITY_HIGH);