summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-24 12:07:20 -0400
committerLen Brown <len.brown@intel.com>2005-08-24 12:08:54 -0400
commit888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch)
tree2a1614a7c63460e98f55ac5905f3a4be679138f1 /include/linux
parent84ffa747520edd4556b136bdfc9df9eb1673ce12 (diff)
downloadop-kernel-dev-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.zip
op-kernel-dev-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.tar.gz
[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')
-rw-r--r--include/linux/acpi.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fd48db3..fa1ad1a 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -41,7 +41,7 @@
#include <asm/acpi.h>
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0,
@@ -429,11 +429,11 @@ extern int pci_mmcfg_config_num;
extern int sbf_port ;
-#else /*!CONFIG_ACPI_BOOT*/
+#else /* !CONFIG_ACPI */
#define acpi_mp_config 0
-#endif /*!CONFIG_ACPI_BOOT*/
+#endif /* !CONFIG_ACPI */
int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
OpenPOWER on IntegriCloud