summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-27 23:52:05 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-27 23:52:05 +0200
commit7e1c1a82f505e79a85a822a377bd3369e676ac2d (patch)
treecdb9234e3f803d4c34c543a78c3711b26a292bfc /arch/ia64/include
parent92a18409ba03c1f810b831919596122c60586bc5 (diff)
parent417b4a73b62760db67512892c32f8acc008ab54e (diff)
downloadop-kernel-dev-7e1c1a82f505e79a85a822a377bd3369e676ac2d.zip
op-kernel-dev-7e1c1a82f505e79a85a822a377bd3369e676ac2d.tar.gz
Merge branch 'acpi-headers'
* acpi-headers: ACPI: Add support to force header inclusion rules for <acpi/acpi.h>. ACPI / SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - table definitions. ACPICA: Linux: Allow ACPICA inclusion for CONFIG_ACPI=n builds. ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion. ACPICA: Linux: Add stub implementation of ACPICA 64-bit mathematics. ACPICA: Linux: Add stub support for Linux specific variables and functions.
Diffstat (limited to 'arch/ia64/include')
-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 3f9eaee..35ff13a 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 */
OpenPOWER on IntegriCloud