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/x86_64/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/x86_64/kernel/io_apic.c')
| -rw-r--r-- | arch/x86_64/kernel/io_apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index d206d7e49cf5..1013a8fe44d7 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
| @@ -1841,7 +1841,7 @@ device_initcall(ioapic_init_sysfs); | |||
| 1841 | ACPI-based IOAPIC Configuration | 1841 | ACPI-based IOAPIC Configuration |
| 1842 | -------------------------------------------------------------------------- */ | 1842 | -------------------------------------------------------------------------- */ |
| 1843 | 1843 | ||
| 1844 | #ifdef CONFIG_ACPI_BOOT | 1844 | #ifdef CONFIG_ACPI |
| 1845 | 1845 | ||
| 1846 | #define IO_APIC_MAX_ID 0xFE | 1846 | #define IO_APIC_MAX_ID 0xFE |
| 1847 | 1847 | ||
| @@ -1923,7 +1923,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a | |||
| 1923 | return 0; | 1923 | return 0; |
| 1924 | } | 1924 | } |
| 1925 | 1925 | ||
| 1926 | #endif /*CONFIG_ACPI_BOOT*/ | 1926 | #endif /* CONFIG_ACPI */ |
| 1927 | 1927 | ||
| 1928 | 1928 | ||
| 1929 | /* | 1929 | /* |