Merge git://oak/home/sfr/kernels/iseries/work

7c43ee40 · Paul Mackerras · 97671e4b · fe360cdf · 7c43ee40
Commit 7c43ee40 authored Nov 10, 2005 by Paul Mackerras
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

arch/ppc64/kernel/pci.c arch/ppc64/kernel/pci.c +2 -0

No files found.
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -548,8 +548,10 @@ static int __init pcibios_init(void)
 	if (ppc64_isabridge_dev != NULL)
 		printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));

+#ifdef CONFIG_PPC_MULTIPLATFORM
 	/* map in PCI I/O space */
 	phbs_remap_io();
+#endif

 	printk("PCI: Probing PCI hardware done\n");