aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-10 16:10:01 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-10 16:10:01 +1100
commit7c43ee40ec602db3fa27e6e2d4f092f06ab0901c (patch)
treee1211dc906af22502031660e41abe6d1cb8b524c
parent97671e4b295fba1b7d3de2984f98bcdaeb197a26 (diff)
parentfe360cdfd26503a6def1dfebc0ef8371c5071340 (diff)
Merge git://oak/home/sfr/kernels/iseries/work
-rw-r--r--arch/ppc64/kernel/pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index 46929fb24f3..3cef1b8f57f 100644
--- 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");