diff options
| author | Kumar Gala <galak@freescale.com> | 2005-05-28 15:52:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-28 16:46:16 -0700 |
| commit | 6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa (patch) | |
| tree | 2caecc37d7dbb75102e2df617ed8e5674f797cbe /arch/ppc/platforms | |
| parent | f9e4a005827ec0b33f0c61fec1634a5a3421decd (diff) | |
| download | kernel_samsung_aries-6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa.zip kernel_samsung_aries-6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa.tar.gz kernel_samsung_aries-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/ppc/platforms')
| -rw-r--r-- | arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 2 |
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 3ac0321..e7cfa49 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 */ |