diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/include/asm/acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index 0f82cc2934e1..91df9686a0da 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h | |||
@@ -89,10 +89,12 @@ ia64_acpi_release_global_lock (unsigned int *lock) | |||
89 | #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ | 89 | #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ |
90 | ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) | 90 | ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) |
91 | 91 | ||
92 | #ifdef CONFIG_ACPI | ||
92 | #define acpi_disabled 0 /* ACPI always enabled on IA64 */ | 93 | #define acpi_disabled 0 /* ACPI always enabled on IA64 */ |
93 | #define acpi_noirq 0 /* ACPI always enabled on IA64 */ | 94 | #define acpi_noirq 0 /* ACPI always enabled on IA64 */ |
94 | #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ | 95 | #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ |
95 | #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ | 96 | #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ |
97 | #endif | ||
96 | #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ | 98 | #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ |
97 | static inline void disable_acpi(void) { } | 99 | static inline void disable_acpi(void) { } |
98 | 100 | ||