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/linux/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/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index fd48db320f5b..fa1ad1a60a09 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -41,7 +41,7 @@ | |||
41 | #include <asm/acpi.h> | 41 | #include <asm/acpi.h> |
42 | 42 | ||
43 | 43 | ||
44 | #ifdef CONFIG_ACPI_BOOT | 44 | #ifdef CONFIG_ACPI |
45 | 45 | ||
46 | enum acpi_irq_model_id { | 46 | enum acpi_irq_model_id { |
47 | ACPI_IRQ_MODEL_PIC = 0, | 47 | ACPI_IRQ_MODEL_PIC = 0, |
@@ -429,11 +429,11 @@ extern int pci_mmcfg_config_num; | |||
429 | 429 | ||
430 | extern int sbf_port ; | 430 | extern int sbf_port ; |
431 | 431 | ||
432 | #else /*!CONFIG_ACPI_BOOT*/ | 432 | #else /* !CONFIG_ACPI */ |
433 | 433 | ||
434 | #define acpi_mp_config 0 | 434 | #define acpi_mp_config 0 |
435 | 435 | ||
436 | #endif /*!CONFIG_ACPI_BOOT*/ | 436 | #endif /* !CONFIG_ACPI */ |
437 | 437 | ||
438 | int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); | 438 | int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); |
439 | int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); | 439 | int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); |