diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
| commit | 58a343f22e8ef987b90e34bbef7f1455e3bb5a15 (patch) | |
| tree | fc811fb570639f2083df6d9191b6a8d7cff65352 /arch/i386/kernel/setup.c | |
| parent | 51c38f9bce274a1e8a90aa457fb433be738f7458 (diff) | |
| parent | 3759fa9c55923f719ae944a3f8fbb029b36f759d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/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. |