diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-07 02:00:45 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-12-11 13:42:32 +1100 |
| commit | cb993029094ed61f286793819d3aaa1deea5b252 (patch) | |
| tree | 9beeecd334054899a05632a4c800f1056a5e01a4 /arch/powerpc/platforms | |
| parent | [POWERPC] Inline pci_setup_pci_controller as it has become trivial (diff) | |
| download | linux-dev-cb993029094ed61f286793819d3aaa1deea5b252.tar.xz linux-dev-cb993029094ed61f286793819d3aaa1deea5b252.zip | |
[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>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/iseries/pci.h | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 2 |
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) |