diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-07-10 18:58:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 19:14:43 +0200 |
| commit | 3f68f7d945e37e4d4bf1da445a285c59a6185815 (patch) | |
| tree | 978360d1bf1b4f9ed59fe40e87c7298cb3c4af76 /arch/x86/pci/numa.c | |
| parent | x86, VisWS: turn into generic arch, eliminate Kconfig specials (diff) | |
| download | linux-3f68f7d945e37e4d4bf1da445a285c59a6185815.tar.xz linux-3f68f7d945e37e4d4bf1da445a285c59a6185815.zip | |
x86/pci merge: fixing numaq initialization
Patch d49c4288 (tip/x86/mpparse) introduced some changes in calling
subsys_init calls if CONFIG_X86_NUMAQ option is set. This patch
updates subsystem initalization according to this changes.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci/numa.c')
| -rw-r--r-- | arch/x86/pci/numa.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c index e1620dc8649a..8b5ca1966731 100644 --- a/arch/x86/pci/numa.c +++ b/arch/x86/pci/numa.c @@ -151,7 +151,7 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx); -static int __init pci_numa_init(void) +int __init pci_numa_init(void) { int quad; @@ -176,11 +176,3 @@ static int __init pci_numa_init(void) } return 0; } - -static __init int pci_subsys_init(void) -{ - pci_numa_init(); - pcibios_irq_init(); - pcibios_init(); -} -subsys_initcall(pci_subsys_init); |