Commit-ID: 385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a Gitweb: http://git.kernel.org/tip/385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a Author: Luck, Tony <tony.luck@xxxxxxxxx> AuthorDate: Fri, 5 Oct 2012 15:05:34 -0700 Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> CommitDate: Fri, 5 Oct 2012 15:59:07 -0700 X86 ACPI: Use #ifdef not #if for CONFIG_X86 check Fix a build warning on ia64: include/linux/acpi.h:437:5: warning: "CONFIG_X86" is not defined Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx> Link: http://lkml.kernel.org/r/506f59ae9600b36a4@xxxxxxxxxxxxxxxxxxxxxxxxxxx Cc: Len Brown <lenb@xxxxxxxxxx> Cc: Thomas Renninger <trenn@xxxxxxx> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> --- include/linux/acpi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d14081c..49fe586 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -434,7 +434,7 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control); -#if CONFIG_X86 +#ifdef CONFIG_X86 void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else static inline void arch_reserve_mem_area(acpi_physical_address addr, -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html