From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 19 18:13:31 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 96F54106564A;
	Sat, 19 Jun 2010 18:13:31 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 854F78FC23;
	Sat, 19 Jun 2010 18:13:31 +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 o5JIDVGG056850;
	Sat, 19 Jun 2010 18:13:31 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5JIDVGE056848;
	Sat, 19 Jun 2010 18:13:31 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201006191813.o5JIDVGE056848@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 19 Jun 2010 18:13:31 +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: r209348 - projects/ppc64/sys/powerpc/powerpc
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: Sat, 19 Jun 2010 18:13:31 -0000

Author: nwhitehorn
Date: Sat Jun 19 18:13:31 2010
New Revision: 209348
URL: http://svn.freebsd.org/changeset/base/209348

Log:
  Fix SVN mismerge.

Modified:
  projects/ppc64/sys/powerpc/powerpc/openpic.c

Modified: projects/ppc64/sys/powerpc/powerpc/openpic.c
==============================================================================
--- projects/ppc64/sys/powerpc/powerpc/openpic.c	Sat Jun 19 18:07:15 2010	(r209347)
+++ projects/ppc64/sys/powerpc/powerpc/openpic.c	Sat Jun 19 18:13:31 2010	(r209348)
@@ -124,29 +124,6 @@ openpic_attach(device_t dev)
 		DELAY(100);
 	}
 
-	/* Check if this is a cascaded PIC */
-	sc->sc_irq = 0;
-	sc->sc_intr = NULL;
-	if (resource_list_find(BUS_GET_RESOURCE_LIST(device_get_parent(dev),
-	    dev), SYS_RES_IRQ, 0) != NULL) {
-		sc->sc_intr = bus_alloc_resource_any(dev, SYS_RES_IRQ,
-		    &sc->sc_irq, RF_ACTIVE);
-
-		/* XXX Cascaded PICs pass NULL trapframes! */
-		bus_setup_intr(dev, sc->sc_intr, INTR_TYPE_MISC | INTR_MPSAFE,
-		    openpic_intr, NULL, dev, &sc->sc_icookie);
-	}
-
-	/* Reset the PIC */
-	x = openpic_read(sc, OPENPIC_CONFIG);
-	x |= OPENPIC_CONFIG_RESET;
-	openpic_write(sc, OPENPIC_CONFIG, x);
-
-	while (openpic_read(sc, OPENPIC_CONFIG) & OPENPIC_CONFIG_RESET) {
-		powerpc_sync();
-		DELAY(100);
-	}
-
 	x = openpic_read(sc, OPENPIC_FEATURE);
 	switch (x & OPENPIC_FEATURE_VERSION_MASK) {
 	case 1: