From 138f02f71efd18297ec6c6df79839bcfe23679df Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Fri, 11 Jul 2008 12:14:27 +0200 Subject: [PATCH] --- yaml --- r: 104388 b: refs/heads/master c: 060b9708a0c04cf9af69c128ef7954b6f0a84180 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/legacy.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7282f986eb42..28843e664f0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2510495e208e7a69b64fcf5cdf8966d873536d9e +refs/heads/master: 060b9708a0c04cf9af69c128ef7954b6f0a84180 diff --git a/trunk/arch/x86/pci/legacy.c b/trunk/arch/x86/pci/legacy.c index 132876cc6fca..60e8caa13563 100644 --- a/trunk/arch/x86/pci/legacy.c +++ b/trunk/arch/x86/pci/legacy.c @@ -57,14 +57,14 @@ static int __init pci_legacy_init(void) int __init pci_subsys_init(void) { +#ifdef CONFIG_X86_NUMAQ + pci_numa_init(); +#endif #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;