From 74d1a6e8a166cd477f667a6fcb1e96b8a0cbdac1 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 12 Oct 2010 17:34:08 +0000 Subject: We define IO_APIC_ADDR in , let's use it. As both ioapic.h and acpi.h define a macro named "NMI", rename one of them (NMI -> NMIType in acpi.h). Abuild-tested. Signed-off-by: Uwe Hermann Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5943 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/include/arch/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arch/i386/include') diff --git a/src/arch/i386/include/arch/acpi.h b/src/arch/i386/include/arch/acpi.h index bc7b082f7d..928bd74b65 100644 --- a/src/arch/i386/include/arch/acpi.h +++ b/src/arch/i386/include/arch/acpi.h @@ -175,7 +175,7 @@ enum acpi_apic_types { LocalApic = 0, IOApic = 1, IRQSourceOverride = 2, - NMI = 3, + NMIType = 3, LocalApicNMI = 4, LApicAddressOverride = 5, IOSApic = 6, -- cgit v1.2.3