From: Kumar Gala <galak@freescale.com>
Date: Sat, 28 May 2005 22:52:15 +0000 (-0700)
Subject: [PATCH] ppc32: i8259 PIC should not be initialized if PCI is not configured
X-Git-Tag: v2.6.12-rc6~93
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa;p=linux-2.6

[PATCH] ppc32: i8259 PIC should not be initialized if PCI is not configured

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>
---

diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 3ac0321eed..e7cfa49856 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -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 */