diff options
author | Len Brown <len.brown@intel.com> | 2005-08-24 12:07:20 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-24 12:08:54 -0400 |
commit | 888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch) | |
tree | 2a1614a7c63460e98f55ac5905f3a4be679138f1 /arch/i386/kernel/io_apic.c | |
parent | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (diff) |
[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 'arch/i386/kernel/io_apic.c')
-rw-r--r-- | arch/i386/kernel/io_apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 6578f40bd501..ebedd2e21670 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
@@ -2421,7 +2421,7 @@ device_initcall(ioapic_init_sysfs); | |||
2421 | ACPI-based IOAPIC Configuration | 2421 | ACPI-based IOAPIC Configuration |
2422 | -------------------------------------------------------------------------- */ | 2422 | -------------------------------------------------------------------------- */ |
2423 | 2423 | ||
2424 | #ifdef CONFIG_ACPI_BOOT | 2424 | #ifdef CONFIG_ACPI |
2425 | 2425 | ||
2426 | int __init io_apic_get_unique_id (int ioapic, int apic_id) | 2426 | int __init io_apic_get_unique_id (int ioapic, int apic_id) |
2427 | { | 2427 | { |
@@ -2574,4 +2574,4 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a | |||
2574 | return 0; | 2574 | return 0; |
2575 | } | 2575 | } |
2576 | 2576 | ||
2577 | #endif /*CONFIG_ACPI_BOOT*/ | 2577 | #endif /* CONFIG_ACPI */ |