summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2012-10-05 15:05:34 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2012-10-05 15:59:07 -0700
commit385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a (patch)
tree79cb1756dfe2704a24ac3481ba7c82a29a79c68d /include/linux/acpi.h
parent3dfd8235002727dbd759bb0f80f8ac862f392071 (diff)
downloadlinux-385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a.tar.gz
linux-385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a.tar.bz2
linux-385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a.zip
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>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d14081c10c17..49fe586e3b1e 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,