diff options
Diffstat (limited to 'arch/x86/pci/legacy.c')
| -rw-r--r-- | arch/x86/pci/legacy.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index a67921ce60af..b722dd481b39 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c @@ -14,7 +14,7 @@ static void __devinit pcibios_fixup_peer_bridges(void) int n, devfn; long node; - if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff) + if (pcibios_last_bus <= 0 || pcibios_last_bus > 0xff) return; DBG("PCI: Peer bridge fixup\n"); @@ -55,4 +55,21 @@ static int __init pci_legacy_init(void) return 0; } -subsys_initcall(pci_legacy_init); +int __init pci_subsys_init(void) +{ +#ifdef CONFIG_X86_NUMAQ + pci_numaq_init(); +#endif +#ifdef CONFIG_ACPI + pci_acpi_init(); +#endif +#ifdef CONFIG_X86_VISWS + pci_visws_init(); +#endif + pci_legacy_init(); + pcibios_irq_init(); + pcibios_init(); + + return 0; +} +subsys_initcall(pci_subsys_init); |