diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
| commit | f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2 (patch) | |
| tree | 1612249d11d455cfd6a0d691f5564673ae179c5f /arch/x86/pci/legacy.c | |
| parent | a6784ad7eafa74a085c8458909eda0699a8fcf57 (diff) | |
| parent | 8dd779b19ce5972072ad2372a86c8acbae4da768 (diff) | |
| download | blackbird-op-linux-f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2.tar.gz blackbird-op-linux-f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2.zip | |
Merge branch 'x86/unify-pci' into x86/core
Diffstat (limited to 'arch/x86/pci/legacy.c')
| -rw-r--r-- | arch/x86/pci/legacy.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index a67921ce60af..3c1d795cbbe9 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c @@ -55,4 +55,13 @@ 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(); + pcibios_init(); +} +subsys_initcall(pci_subsys_init); |
