[PATCH] fix ioapic build breakage

f309071a · Jeff Garzik · Linus Torvalds · e2d8ded1 · f309071a
Commit f309071a authored Aug 20, 2003 by Jeff Garzik Committed by Linus Torvalds Aug 20, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

arch/i386/kernel/setup.c arch/i386/kernel/setup.c +3 -1

No files found.
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -543,11 +543,13 @@ static void __init parse_cmdline_early (char ** cmdline_p)
 			if (!acpi_force) acpi_disabled = 1;
 		}

+#ifdef CONFIG_X86_LOCAL_APIC
 		/* disable IO-APIC */
 		else if (!memcmp(from, "noapic", 6)) {
 			skip_ioapic_setup = 1;
 		}
-#endif
+#endif /* CONFIG_X86_LOCAL_APIC */
+#endif /* CONFIG_ACPI_BOOT */

 		/*
 		 * highmem=size forces highmem to be exactly 'size' bytes.