Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / arch / x86 / pci / legacy.c

diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index a67921ce60af1faabf9c8ccbf538b546103ebb04..132876cc6fca3e9d42cd836b2378ee26b4cdf7c7 100644 (file)
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -55,4 +55,18 @@ static int __init pci_legacy_init(void)
        return 0;
 }
 
-subsys_initcall(pci_legacy_init);
+int __init pci_subsys_init(void)
+{
+#ifdef CONFIG_ACPI
+       pci_acpi_init();
+#endif
+       pci_legacy_init();
+       pcibios_irq_init();
+#ifdef CONFIG_X86_NUMAQ
+       pci_numa_init();
+#endif
+       pcibios_init();
+
+       return 0;
+}
+subsys_initcall(pci_subsys_init);