summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2014-07-16 10:58:08 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-23 01:10:44 +0200
commitd334c823b27401721591e0f1220050a41af08165 (patch)
treee1e85c8ee39d459c457b63cc040276f4d1376a9e /arch/ia64
parentACPICA: Linux: Add stub implementation of ACPICA 64-bit mathematics. (diff)
downloadlinux-d334c823b27401721591e0f1220050a41af08165.tar.xz
linux-d334c823b27401721591e0f1220050a41af08165.zip
ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion.
The forthcoming patch will make <acpi/acpi.h> to be visible to all kernel source code. Thus for the architectures that do not support ACPI and haven't implemented <asm/acenv.h>, we need to make it excluded. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/acenv.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/acenv.h b/arch/ia64/include/asm/acenv.h
index 3f9eaeec9873..35ff13afbf34 100644
--- a/arch/ia64/include/asm/acenv.h
+++ b/arch/ia64/include/asm/acenv.h
@@ -19,8 +19,6 @@
/* Asm macros */
-#ifdef CONFIG_ACPI
-
static inline int
ia64_acpi_acquire_global_lock(unsigned int *lock)
{
@@ -51,6 +49,4 @@ ia64_acpi_release_global_lock(unsigned int *lock)
#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
-#endif
-
#endif /* _ASM_IA64_ACENV_H */