svn commit: r209348 - projects/ppc64/sys/powerpc/powerpc

[Nathan Whitehorn]

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: