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 /include/asm-i386/acpi.h | |
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 'include/asm-i386/acpi.h')
-rw-r--r-- | include/asm-i386/acpi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index cf828ace13f..1f1ade923d6 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h | |||
@@ -103,7 +103,7 @@ __acpi_release_global_lock (unsigned int *lock) | |||
103 | :"=r"(n_hi), "=r"(n_lo) \ | 103 | :"=r"(n_hi), "=r"(n_lo) \ |
104 | :"0"(n_hi), "1"(n_lo)) | 104 | :"0"(n_hi), "1"(n_lo)) |
105 | 105 | ||
106 | #ifdef CONFIG_ACPI_BOOT | 106 | #ifdef CONFIG_ACPI |
107 | extern int acpi_lapic; | 107 | extern int acpi_lapic; |
108 | extern int acpi_ioapic; | 108 | extern int acpi_ioapic; |
109 | extern int acpi_noirq; | 109 | extern int acpi_noirq; |
@@ -146,7 +146,7 @@ static inline void check_acpi_pci(void) { } | |||
146 | 146 | ||
147 | #endif | 147 | #endif |
148 | 148 | ||
149 | #else /* CONFIG_ACPI_BOOT */ | 149 | #else /* !CONFIG_ACPI */ |
150 | # define acpi_lapic 0 | 150 | # define acpi_lapic 0 |
151 | # define acpi_ioapic 0 | 151 | # define acpi_ioapic 0 |
152 | 152 | ||