Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 978dc0196a0f..ba2e165a8a0f 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -624,7 +624,7 @@ void __init setup_arch(char **cmdline_p)
         /*
          * NOTE: before this point _nobody_ is allowed to allocate
          * any memory using the bootmem allocator.  Although the
-         * alloctor is now initialised only the first 8Mb of the kernel
+         * allocator is now initialised only the first 8Mb of the kernel
          * virtual address space has been mapped.  All allocations before
          * paging_init() has completed must use the alloc_bootmem_low_pages()
          * variant (which allocates DMA'able memory) and care must be taken
@@ -661,9 +661,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
 #ifdef CONFIG_PCI
-#ifdef CONFIG_X86_IO_APIC
-        check_acpi_pci();       /* Checks more than just ACPI actually */
-#endif
+        early_quirks();
 #endif
 
 #ifdef CONFIG_ACPI