diff options
author | Lv Zheng <lv.zheng@intel.com> | 2014-07-16 04:58:08 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-22 19:10:44 -0400 |
commit | d334c823b27401721591e0f1220050a41af08165 (patch) | |
tree | e1e85c8ee39d459c457b63cc040276f4d1376a9e /arch/ia64 | |
parent | daba25d6e09e923ca4458211ca086eeb8bef8b5a (diff) |
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.h | 4 |
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 @@ | |||
19 | 19 | ||
20 | /* Asm macros */ | 20 | /* Asm macros */ |
21 | 21 | ||
22 | #ifdef CONFIG_ACPI | ||
23 | |||
24 | static inline int | 22 | static inline int |
25 | ia64_acpi_acquire_global_lock(unsigned int *lock) | 23 | ia64_acpi_acquire_global_lock(unsigned int *lock) |
26 | { | 24 | { |
@@ -51,6 +49,4 @@ ia64_acpi_release_global_lock(unsigned int *lock) | |||
51 | #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ | 49 | #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ |
52 | ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) | 50 | ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) |
53 | 51 | ||
54 | #endif | ||
55 | |||
56 | #endif /* _ASM_IA64_ACENV_H */ | 52 | #endif /* _ASM_IA64_ACENV_H */ |