aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/pci/legacy.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-11 21:22:18 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-11 21:22:18 +0200
commit6c82a000a29b93541b5b7db597a083c069755cc9 (patch)
treeb9e49724f56b47e4b3d0bd6c6fa3be88dac3a9e6 /arch/x86/pci/legacy.c
parent5b4d2386c23e5de553fce002892c7691a989b350 (diff)
parent39415a440ecceb0a5bd3c23686f18f83bb8368c6 (diff)
Merge branch 'x86/generalize-visws' into x86/core
Diffstat (limited to 'arch/x86/pci/legacy.c')
-rw-r--r--arch/x86/pci/legacy.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index 3c1d795cbbe..132876cc6fc 100644
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -62,6 +62,11 @@ int __init pci_subsys_init(void)
#endif
pci_legacy_init();
pcibios_irq_init();
+#ifdef CONFIG_X86_NUMAQ
+ pci_numa_init();
+#endif
pcibios_init();
+
+ return 0;
}
subsys_initcall(pci_subsys_init);