diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 00:10:01 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 00:10:01 -0500 |
| commit | 7c43ee40ec602db3fa27e6e2d4f092f06ab0901c (patch) | |
| tree | e1211dc906af22502031660e41abe6d1cb8b524c /arch | |
| parent | 97671e4b295fba1b7d3de2984f98bcdaeb197a26 (diff) | |
| parent | fe360cdfd26503a6def1dfebc0ef8371c5071340 (diff) | |
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) | |||
| 548 | if (ppc64_isabridge_dev != NULL) | 548 | if (ppc64_isabridge_dev != NULL) |
| 549 | printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev)); | 549 | printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev)); |
| 550 | 550 | ||
| 551 | #ifdef CONFIG_PPC_MULTIPLATFORM | ||
| 551 | /* map in PCI I/O space */ | 552 | /* map in PCI I/O space */ |
| 552 | phbs_remap_io(); | 553 | phbs_remap_io(); |
| 554 | #endif | ||
| 553 | 555 | ||
| 554 | printk("PCI: Probing PCI hardware done\n"); | 556 | printk("PCI: Probing PCI hardware done\n"); |
| 555 | 557 | ||