summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-05-28 15:52:15 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-28 16:46:16 -0700
commit6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa (patch)
tree2caecc37d7dbb75102e2df617ed8e5674f797cbe /arch
parentf9e4a005827ec0b33f0c61fec1634a5a3421decd (diff)
downloadlinux-6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa.tar.bz2
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_cds_common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 3ac0321eed03..e7cfa498568c 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 */