--- linux-2.4.22-rc2.orig/arch/i386/kernel/setup.c	Wed Aug 20 23:52:45 2003
+++ linux-2.4.22-rc2/arch/i386/kernel/setup.c	Wed Aug 20 23:54:36 2003
@@ -824,11 +824,12 @@
 			acpi_ht = 1; 
 			if (!acpi_force) acpi_disabled = 1; 
 		} 
-
-                /* disable IO-APIC */
-                else if (!memcmp(from, "noapic", 6)) {
-                        skip_ioapic_setup = 1;
-                }
+#ifdef CONFIG_X86_IO_APIC
+		/* disable IO-APIC */
+		else if (!memcmp(from, "noapic", 6)) {
+			skip_ioapic_setup = 1;
+		}
+#endif
 #endif
 		/*
 		 * highmem=size forces highmem to be exactly 'size' bytes.