]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[PATCH] ppc32: i8259 PIC should not be initialized if PCI is not configured
authorKumar Gala <galak@freescale.com>
Sat, 28 May 2005 22:52:15 +0000 (15:52 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 28 May 2005 23:46:16 +0000 (16:46 -0700)
Trying to initialize the i8259 PIC will not work if CONFIG_PCI is not
enabled.  The kernel hangs if the initialization is tried.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/ppc/platforms/85xx/mpc85xx_cds_common.c

index 3ac0321eed03eebb157aea3878c381f367ed300b..e7cfa498568c25b03f891bd809a3342010c32f58 100644 (file)
@@ -200,12 +200,14 @@ mpc85xx_cds_init_IRQ(void)
         */
        openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
 
+#ifdef CONFIG_PCI
        openpic_hookup_cascade(PIRQ0A, "82c59 cascade", i8259_irq);
 
        for (i = 0; i < NUM_8259_INTERRUPTS; i++)
                irq_desc[i].handler = &i8259_pic;
 
        i8259_init(0);
+#endif
 
 #ifdef CONFIG_CPM2
        /* Setup CPM2 PIC */