This patch adds a kernel configuration item to indicate the presense of the architecture specific support for ACPICA, so that <asm/acenv.h> inclusion can be configured out. Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx> --- arch/ia64/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 4 ++++ include/acpi/platform/aclinux.h | 2 ++ 4 files changed, 8 insertions(+) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 4e4119b..c38cc47 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -43,6 +43,7 @@ config IA64 select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_SUPPORTS_ACPICA default y help The Itanium Processor Family is Intel's 64-bit successor to diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e903c71..0fd5a4d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -124,6 +124,7 @@ config X86 select RTC_LIB select HAVE_DEBUG_STACKOVERFLOW select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64 + select ARCH_SUPPORTS_ACPICA config INSTRUCTION_DECODER def_bool y diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 5d92485..22e5762 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -2,8 +2,12 @@ # ACPI Configuration # +config ARCH_SUPPORTS_ACPICA + bool + menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" + depends on ARCH_SUPPORTS_ACPICA depends on !IA64_HP_SIM depends on IA64 || X86 depends on PCI diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 8176181..b754bfa 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -80,7 +80,9 @@ #ifdef EXPORT_ACPI_INTERFACES #include <linux/export.h> #endif +#ifdef CONFIG_ARCH_SUPPORTS_ACPICA #include <asm/acenv.h> +#endif #include <asm/acpi.h> #ifdef CONFIG_ACPI -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
