diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /arch/i386/kernel/setup.c | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/i386/kernel/setup.c')
| -rw-r--r-- | arch/i386/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 51e513b4f72d..ab62a9f4701e 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
| @@ -1599,6 +1599,10 @@ void __init setup_arch(char **cmdline_p) | |||
| 1599 | if (efi_enabled) | 1599 | if (efi_enabled) |
| 1600 | efi_map_memmap(); | 1600 | efi_map_memmap(); |
| 1601 | 1601 | ||
| 1602 | #ifdef CONFIG_X86_IO_APIC | ||
| 1603 | check_acpi_pci(); /* Checks more than just ACPI actually */ | ||
| 1604 | #endif | ||
| 1605 | |||
| 1602 | #ifdef CONFIG_ACPI | 1606 | #ifdef CONFIG_ACPI |
| 1603 | /* | 1607 | /* |
| 1604 | * Parse the ACPI tables for possible boot-time SMP configuration. | 1608 | * Parse the ACPI tables for possible boot-time SMP configuration. |