[POWERPC] iSeries: Call iSeries_pcibios_init from setup_arch

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 5 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/iseries/pci.h b/arch/powerpc/platforms/iseries/pci.h
index 3af9cf1c1d04..b14287342129 100644
--- a/arch/powerpc/platforms/iseries/pci.h
+++ b/arch/powerpc/platforms/iseries/pci.h
@@ -50,9 +50,11 @@ struct pci_dev;				/* For Forward Reference */
 extern void     iSeries_Device_Information(struct pci_dev *PciDev, int count,
                         u16 bus, HvSubBusNumber subbus);
 #ifdef CONFIG_PCI
+extern void     iSeries_pcibios_init(void);
 extern void     iSeries_pci_final_fixup(void);
 #else
-static void     iSeries_pci_final_fixup(void) { }
+static inline void      iSeries_pcibios_init(void) { }
+static inline void      iSeries_pci_final_fixup(void) { }
 #endif
 
 #endif /* _PLATFORMS_ISERIES_PCI_H */
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 2175a71800d5..5616219a20d5 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -495,6 +495,8 @@ static void __init iSeries_setup_arch(void)
                         itVpdAreas.xSlicMaxLogicalProcs);
         printk("Max physical processors = %d\n",
                         itVpdAreas.xSlicMaxPhysicalProcs);
+
+        iSeries_pcibios_init();
 }
 
 static void iSeries_show_cpuinfo(struct seq_file *m)