diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 07:21:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 07:21:59 -0700 |
| commit | 6a4b170c54289f427645019c52d1b9c871a6661e (patch) | |
| tree | e129355a1e07a6ee7f24a3df1fdb59906f733bf4 /include/asm-i386/mpspec.h | |
| parent | eccdfcd6f8265300380fa14a83aeb14e69830323 (diff) | |
| parent | 64e47488c913ac704d465a6af86a26786d1412a5 (diff) | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'include/asm-i386/mpspec.h')
| -rw-r--r-- | include/asm-i386/mpspec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/mpspec.h b/include/asm-i386/mpspec.h index d84a9c326c2..64a0b8e6afe 100644 --- a/include/asm-i386/mpspec.h +++ b/include/asm-i386/mpspec.h @@ -27,14 +27,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) |