From a76925d26b1098d0bfd1e53c305e44d90c136ac9 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Sun, 27 Sep 2009 04:17:21 -0400 Subject: [PATCH] --- yaml --- r: 166485 b: refs/heads/master c: e56d953d190061938b31cabbe01b7f3d76c60bd0 h: refs/heads/master i: 166483: 2bae00afeb195f1035deeb8e1010a35e214c5041 v: v3 --- [refs] | 2 +- trunk/arch/ia64/include/asm/acpi.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d18bd6c67637..3b723ae8a2ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d5b6fb47a8e68fa311ca2c3447e7f8a7c3a9cf3 +refs/heads/master: e56d953d190061938b31cabbe01b7f3d76c60bd0 diff --git a/trunk/arch/ia64/include/asm/acpi.h b/trunk/arch/ia64/include/asm/acpi.h index 0f82cc2934e1..91df9686a0da 100644 --- a/trunk/arch/ia64/include/asm/acpi.h +++ b/trunk/arch/ia64/include/asm/acpi.h @@ -89,10 +89,12 @@ ia64_acpi_release_global_lock (unsigned int *lock) #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) +#ifdef CONFIG_ACPI #define acpi_disabled 0 /* ACPI always enabled on IA64 */ #define acpi_noirq 0 /* ACPI always enabled on IA64 */ #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ +#endif #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ static inline void disable_acpi(void) { }