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-x86_64/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-x86_64/acpi.h')
-rw-r--r-- | include/asm-x86_64/acpi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h index dc8c981af27f..7d537e1867c7 100644 --- a/include/asm-x86_64/acpi.h +++ b/include/asm-x86_64/acpi.h | |||
@@ -101,7 +101,7 @@ __acpi_release_global_lock (unsigned int *lock) | |||
101 | :"=r"(n_hi), "=r"(n_lo) \ | 101 | :"=r"(n_hi), "=r"(n_lo) \ |
102 | :"0"(n_hi), "1"(n_lo)) | 102 | :"0"(n_hi), "1"(n_lo)) |
103 | 103 | ||
104 | #ifdef CONFIG_ACPI_BOOT | 104 | #ifdef CONFIG_ACPI |
105 | extern int acpi_lapic; | 105 | extern int acpi_lapic; |
106 | extern int acpi_ioapic; | 106 | extern int acpi_ioapic; |
107 | extern int acpi_noirq; | 107 | extern int acpi_noirq; |
@@ -122,10 +122,10 @@ static inline void disable_acpi(void) | |||
122 | 122 | ||
123 | extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); | 123 | extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); |
124 | 124 | ||
125 | #else /* !CONFIG_ACPI_BOOT */ | 125 | #else /* !CONFIG_ACPI */ |
126 | #define acpi_lapic 0 | 126 | #define acpi_lapic 0 |
127 | #define acpi_ioapic 0 | 127 | #define acpi_ioapic 0 |
128 | #endif /* !CONFIG_ACPI_BOOT */ | 128 | #endif /* !CONFIG_ACPI */ |
129 | 129 | ||
130 | extern int acpi_numa; | 130 | extern int acpi_numa; |
131 | extern int acpi_scan_nodes(unsigned long start, unsigned long end); | 131 | extern int acpi_scan_nodes(unsigned long start, unsigned long end); |