diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-10-12 17:34:08 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-10-12 17:34:08 +0000 |
| commit | 74d1a6e8a166cd477f667a6fcb1e96b8a0cbdac1 (patch) | |
| tree | 9cbdbe86bd282da60bfcbef7108ca6790bcde94e /src/arch/i386/include | |
| parent | 4ffde94c4ec51cdb24103ec13653e6f40513e1bb (diff) | |
We define IO_APIC_ADDR in <arch/ioapic.h>, 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 <uwe@hermann-uwe.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5943 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386/include')
| -rw-r--r-- | src/arch/i386/include/arch/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
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, |