Fixup rtas_pci.c mpic initialisation now that ppc64_interrupt_controller is gone. Signed-off-by: Benjamin Herrenschmidt Index: linux-irq-work/arch/powerpc/kernel/rtas_pci.c =================================================================== --- linux-irq-work.orig/arch/powerpc/kernel/rtas_pci.c 2006-07-01 15:25:09.000000000 +1000 +++ linux-irq-work/arch/powerpc/kernel/rtas_pci.c 2006-07-01 15:25:53.000000000 +1000 @@ -301,11 +301,8 @@ unsigned int *opprop = NULL; struct device_node *root = of_find_node_by_path("/"); - if (ppc64_interrupt_controller == IC_OPEN_PIC) { - opprop = (unsigned int *)get_property(root, - "platform-open-pic", NULL); - } - + opprop = (unsigned int *)get_property(root, + "platform-open-pic", NULL); root_size_cells = prom_n_size_cells(root); index = 0; @@ -325,8 +322,7 @@ pci_process_bridge_OF_ranges(phb, node, 0); pci_setup_phb_io(phb, index == 0); #ifdef CONFIG_PPC_PSERIES - /* XXX This code need serious fixing ... --BenH */ - if (ppc64_interrupt_controller == IC_OPEN_PIC && pSeries_mpic) { + if (opprop && pSeries_mpic) { int addr = root_size_cells * (index + 2) - 1; mpic_assign_isu(pSeries_mpic, index, opprop[addr]); }