diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 06:10:01 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 06:10:01 +0100 |
| commit | 7c43ee40ec602db3fa27e6e2d4f092f06ab0901c (patch) | |
| tree | e1211dc906af22502031660e41abe6d1cb8b524c /arch | |
| parent | ppc64: Add declarations to ppc64 headers as well as powerpc headers (diff) | |
| parent | powerpc: fix iSeries build (diff) | |
| download | linux-7c43ee40ec602db3fa27e6e2d4f092f06ab0901c.tar.xz linux-7c43ee40ec602db3fa27e6e2d4f092f06ab0901c.zip | |
Merge git://oak/home/sfr/kernels/iseries/work
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc64/kernel/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c index 46929fb24f3c..3cef1b8f57f0 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"); |