Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a

Authored by Luck, Tony
Committed by H. Peter Anvin
1 parent 3dfd823500
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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@intel.com>
Link: http://lkml.kernel.org/r/506f59ae9600b36a4@agluck-desktop.sc.intel.com
Cc: Len Brown <lenb@kernel.org>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

include/linux/acpi.h
Diff comments   View file @ 385ddea
... ... @@ -434,7 +434,7 @@
434 434  
435 435 acpi_status acpi_os_prepare_sleep(u8 sleep_state,
436 436 u32 pm1a_control, u32 pm1b_control);
437   -#if CONFIG_X86
  437 +#ifdef CONFIG_X86
438 438 void arch_reserve_mem_area(acpi_physical_address addr, size_t size);
439 439 #else
440 440 static inline void arch_reserve_mem_area(acpi_physical_address addr,