summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/mpspec.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-24 18:07:20 +0200
committerLen Brown <len.brown@intel.com>2005-08-24 18:08:54 +0200
commit888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch)
tree2a1614a7c63460e98f55ac5905f3a4be679138f1 /include/asm-i386/mpspec.h
parentMerge from-linus to-akpm (diff)
downloadlinux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.tar.xz
linux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.zip
[ACPI] delete CONFIG_ACPI_BOOT
it has been a synonym for CONFIG_ACPI since 2.6.12 Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/asm-i386/mpspec.h')
-rw-r--r--include/asm-i386/mpspec.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/mpspec.h b/include/asm-i386/mpspec.h
index d9fafba075bc..b9e9f66d2721 100644
--- a/include/asm-i386/mpspec.h
+++ b/include/asm-i386/mpspec.h
@@ -26,14 +26,14 @@ extern unsigned long mp_lapic_addr;
extern int pic_mode;
extern int using_apic_timer;
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
extern void mp_register_lapic (u8 id, u8 enabled);
extern void mp_register_lapic_address (u64 address);
extern void mp_register_ioapic (u8 id, u32 address, u32 gsi_base);
extern void mp_override_legacy_irq (u8 bus_irq, u8 polarity, u8 trigger, u32 gsi);
extern void mp_config_acpi_legacy_irqs (void);
extern int mp_register_gsi (u32 gsi, int edge_level, int active_high_low);
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /* CONFIG_ACPI */
#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS)