--- linux-2.6.16.16/arch/i386/kernel/setup.c	2006-05-18 11:34:10.000000000 -0400
+++ linux-2.6.16.16-fixed/arch/i386/kernel/setup.c	2006-05-18 11:51:46.000000000 -0400
@@ -1599,11 +1599,9 @@
 	if (efi_enabled)
 		efi_map_memmap();
 
-#ifdef CONFIG_X86_IO_APIC
+#ifdef CONFIG_ACPI
 	check_acpi_pci();	/* Checks more than just ACPI actually */
-#endif
 
-#ifdef CONFIG_ACPI
 	/*
 	 * Parse the ACPI tables for possible boot-time SMP configuration.
 	 */