diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-24 18:07:20 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-24 18:08:54 +0200 |
| commit | 888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch) | |
| tree | 2a1614a7c63460e98f55ac5905f3a4be679138f1 /include/asm-i386/acpi.h | |
| parent | Merge from-linus to-akpm (diff) | |
| download | linux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.tar.xz linux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.zip | |
[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 cf828ace13f9..1f1ade923d69 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -103,7 +103,7 @@ __acpi_release_global_lock (unsigned int *lock) :"=r"(n_hi), "=r"(n_lo) \ :"0"(n_hi), "1"(n_lo)) -#ifdef CONFIG_ACPI_BOOT +#ifdef CONFIG_ACPI extern int acpi_lapic; extern int acpi_ioapic; extern int acpi_noirq; @@ -146,7 +146,7 @@ static inline void check_acpi_pci(void) { } #endif -#else /* CONFIG_ACPI_BOOT */ +#else /* !CONFIG_ACPI */ # define acpi_lapic 0 # define acpi_ioapic 0 |